@hydranium/core 1.0.0-next.14 → 1.0.0-next.140

package/lib/langium/document-builder/document-builder.js

@@ -7,9 +7,13 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import { ObservableValue } from '@hydranium/protocol';
-import { DefaultDocumentBuilder, DocumentState, OperationCancelled, UriUtils, interruptAndCheck, isOperationCancelled } from '@hydranium/langium';
-import { CancellationToken } from 'vscode-languageserver-protocol';
+import { DefaultDocumentBuilder, DocumentState, MultiMap, OperationCancelled, UriUtils, interruptAndCheck, isOperationCancelled } from '@hydranium/langium';
+// `Diagnostic` as a VALUE: `renderDiagnostics` needs its `getMessageString`
+// namespace helper to read the `string | MarkupContent` union without
+// restating it.
+import { CancellationToken, Diagnostic, Disposable } from 'vscode-languageserver-protocol';
 import { CST_REHYDRATION_RESET_STATE, isCstShed } from '../residency/cst-residency-service.js';
+import { BuildSession } from './build-session.js';
 import { labelPhaseListener } from './labeled-phase-listener.js';
 /** Document states a phase-reached line is emitted for by default — every built phase. */
 export const DEFAULT_LOGGED_PHASES = [
@@ -20,6 +24,19 @@ export const DEFAULT_LOGGED_PHASES = [
     DocumentState.IndexedReferences,
     DocumentState.Validated
 ];
+/**
+ * The build reasons the framework stages through
+ * {@link HydraniumDocumentBuilder.markNextReason}: the LSP events the update
+ * handler dispatches on, and `didClose` for the revert the text store runs
+ * after a last close. Exposed so a subclass layering reasons of its own keeps
+ * the names the framework emits.
+ */
+export const HYDRANIUM_BUILD_REASONS = Object.freeze({
+    didOpen: 'didOpen',
+    didChangeContent: 'didChangeContent',
+    didChangeWatchedFiles: 'didChangeWatchedFiles',
+    didClose: 'didClose'
+});
 /**
  * Consecutive re-queued builds that leave a waited-on document at the same state
  * before {@link HydraniumDocumentBuilder.awaitDocumentState} stops re-queuing it.
@@ -32,7 +49,8 @@ const MAX_STALLED_REQUEUES = 3;
  * Extends Langium's {@link DefaultDocumentBuilder} with:
  *
  * - **Bug-fixes** (always on): an {@link awaitDocumentState} that waits where
- *   the default rejects, a {@link prepareBuild} that keeps a cancelled
+ *   the default rejects (re-queuing, under the workspace lock, a document no
+ *   build will carry), a {@link prepareBuild} that keeps a cancelled
  *   non-validating build from suppressing validation, and a
  *   {@link shouldRelink} that never judges a document unaffected on an index
  *   that does not describe it.
@@ -42,15 +60,24 @@ const MAX_STALLED_REQUEUES = 3;
  * - **In-place rebuild helpers** — {@link reparse} and
  *   {@link reparseAndRelink} — for a build-phase listener that mutated a
  *   document's AST and must reconcile it within the same build.
- * - **Diagnostic dedupe** at `Validated` ({@link dedupeDiagnostics}).
+ * - **Diagnostic dedupe** at `Validated` ({@link dedupeDiagnostics}), followed
+ *   by the **one server-side message render** every head inherits
+ *   ({@link renderDiagnostics}).
+ * - **Build sessions** ({@link BuildSession}): each `update` / `build` call is
+ *   one correlated unit carrying an id, a trigger label, a start time and
+ *   cancellation lineage, so every line of a rebuild reads as belonging to it
+ *   and a preempted build is distinguishable from the winner.
  * - **Logging instrumentation** (default on, opt-out via `logLevel: 'off'`):
- *   phase-reached lines, slow-listener breakdowns on `notifyDocumentPhase`,
- *   and slow-build-phase totals on `notifyBuildPhase`.
+ *   a per-build line, phase-reached lines, slow-listener breakdowns on
+ *   `notifyDocumentPhase`, and slow-build-phase totals on `notifyBuildPhase`.
  *
  * Adopters extend this class — the configuration knobs cover what most
  * adopters need; the `format*Line` methods, `formatUri`, and
  * `collectDeletedURIs` are protected so subclasses can customise wording or
- * domain-aware cascades without re-implementing surrounding logic.
+ * domain-aware cascades without re-implementing surrounding logic. An adopter
+ * with build-scoped state of its own subclasses {@link BuildSession} and
+ * overrides {@link createBuildSession}, which puts that state under the same
+ * preemption-correct teardown rather than a reimplementation of it.
  */
 export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
     tracer;
@@ -64,8 +91,13 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
     slowListenerMs;
     /** Live slow-build-phase-total threshold; read `.value` per phase. */
     slowBuildMs;
+    /** Live phase-detail buffering threshold; read `.value` once per build, onto the session. */
+    phaseDetailMs;
     uriPolicy;
     clock;
+    messageRenderer;
+    /** The lock a re-queued build takes; see {@link requeueOrphaned}. */
+    workspaceLock;
     /** Narrower handle on the same registry as the inherited `serviceRegistry`, for {@link ExtendedServiceRegistry.registrations}. */
     languageRegistry;
     languageFileExtensions = [];
@@ -76,17 +108,38 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
     refreshCrossDocumentComputedScopes;
     /** LSP event name (e.g. `'didChangeWatchedFiles'`) staged for the next `update()` call. */
     pendingUpdateReason;
+    /**
+     * The build currently in progress, or `undefined` between builds.
+     *
+     * A subclass carrying its own build-scoped state returns a {@link BuildSession}
+     * subclass from {@link createBuildSession} and narrows this with a typeguard
+     * where it reads that state — rather than redeclaring the field, whose
+     * initialiser would run after `super()` and clear a session opened during
+     * construction.
+     */
+    activeSession;
+    /**
+     * `traceId` of the last build that ended in cancellation, for the successor's
+     * "cancels #N" tag. Held here rather than on a session because the session
+     * that carries it is already gone by the time its successor is opened.
+     */
+    lastCancelledTraceId;
+    /** Registered through {@link onDocumentPhaseDelivered}, by phase. */
+    documentPhaseDeliveredListeners = new MultiMap();
     constructor(services, options = {}) {
         super(services);
         this.languageRegistry = services.ServiceRegistry;
         this.uriPolicy = services.workspace.DocumentUriPolicy;
         this.clock = services.Clock;
+        this.messageRenderer = services.MessageRenderer;
+        this.workspaceLock = services.workspace.WorkspaceLock;
         this.tracer = services.Tracer.for(options.logName ?? 'DocumentBuilder').trace('instantiated');
         this.logLevel = options.logLevel ?? 'debug';
         this.loggedPhases = options.loggedPhases ?? DEFAULT_LOGGED_PHASES;
         this.slowPhaseMs = ObservableValue.from(options.slowPhaseMs ?? 25);
         this.slowListenerMs = ObservableValue.from(options.slowListenerMs ?? 5);
         this.slowBuildMs = ObservableValue.from(options.slowBuildMs ?? 25);
+        this.phaseDetailMs = ObservableValue.from(options.phaseDetailMs ?? 0);
         this.refreshCrossDocumentComputedScopes = options.refreshCrossDocumentComputedScopes ?? false;
         if (this.logLevel !== 'off') {
             this.registerPhaseListeners();
@@ -97,8 +150,8 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
     // ============================================================
     /**
      * Stage an LSP event name for the next `update()` call. Adopters call before
-     * the update fires; `HydraniumDocumentUpdateHandler` does it for the
-     * four LSP events.
+     * the update fires; `HydraniumDocumentUpdateHandler` does it for the LSP
+     * events, and the text store for the revert that follows a last close.
      *
      * The framework stages the value and never reads it back. The consumer is a
      * subclass overriding the build logging, which takes
@@ -109,6 +162,23 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
     markNextReason(reason) {
         this.pendingUpdateReason = reason;
     }
+    /**
+     * Call `listener` with a document once every {@link onDocumentPhase}
+     * listener of `state` ran for it and none was skipped by cancellation, and
+     * with the text version the phase listeners were called at. A write during
+     * them moves the document's own version on, past what they saw.
+     *
+     * Only here is it known what the phase listeners delivered. Langium sets the
+     * document's state before it notifies, and a cancel between two listeners
+     * skips the rest, leaving the document at the phase with those listeners
+     * never run and nothing to run them later. A build-phase listener comes too
+     * late: a cancel after this document but before the batch ends skips it,
+     * although every listener of this document ran.
+     */
+    onDocumentPhaseDelivered(state, listener) {
+        this.documentPhaseDeliveredListeners.add(state, listener);
+        return Disposable.create(() => this.documentPhaseDeliveredListeners.delete(state, listener));
+    }
     /**
      * Diagnostic snapshot for use in timeout/error messages around document
      * state.
@@ -126,7 +196,15 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
         const doc = this.langiumDocuments.getDocument(UriUtils.toUri(this.uriPolicy.canonicalUri(uri)));
         const docState = doc ? DocumentState[doc.state] : 'unknown (document not loaded)';
         const lastPhase = this.lastPhaseMs > 0 ? `${Math.round(performance.now() - this.lastPhaseMs)}ms ago` : 'no phase observed';
-        return `current state: '${docState}', last phase: ${lastPhase}`;
+        return `current state: '${docState}', last phase: ${lastPhase}, active build: ${this.formatSession(this.activeSession)}`;
+    }
+    /** Render a session for a status line. `undefined` — no build in progress — reads as `none`. */
+    formatSession(session) {
+        if (!session) {
+            return 'none';
+        }
+        const id = session.traceId !== undefined ? `#${session.traceId}` : 'untimed';
+        return `${id} (${session.trigger}, ${Math.round(performance.now() - session.startMs)}ms in)`;
     }
     // ============================================================
     // Bug-fixes (always on)
@@ -152,13 +230,24 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
      * {@link MAX_STALLED_REQUEUES} builds that fail to advance the document, so a
      * document the builder will never carry to `state` degrades to a pending wait
      * plus a warning rather than an endless build loop.
+     *
+     * A wait for `Validated` on a document that a validating build skips
+     * resolves once that build has indexed its references, without diagnostics:
+     * see {@link skipsValidation}. Waiting on would never end, and re-queuing
+     * would skip it again.
+     *
+     * A re-queued build takes the {@link WorkspaceLock} (see
+     * {@link requeueOrphaned}), so a caller that awaits this wait while it holds
+     * the lock, inside a read or write action, deadlocks on a document that needs
+     * a re-queue: the build waits for that action to end. Await it outside the
+     * lock.
      */
     awaitDocumentState(state, uri, cancelToken) {
         const document = this.langiumDocuments.getDocument(uri);
         if (!document) {
             return super.awaitDocumentState(state, uri, cancelToken);
         }
-        if (document.state >= state) {
+        if (document.state >= state || (state === DocumentState.Validated && this.skipsValidation(document))) {
             return Promise.resolve(uri);
         }
         return new Promise((resolve, reject) => {
@@ -194,8 +283,18 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
                     resolve(doc.uri);
                 }
             }, 'awaitDocumentState'));
+            // The phase after which a validating build either validates the
+            // document or has skipped it.
+            const skipDisposable = state === DocumentState.Validated
+                ? this.onDocumentPhase(DocumentState.IndexedReferences, labelPhaseListener((doc) => {
+                    if (UriUtils.equals(doc.uri, uri) && this.skipsValidation(doc)) {
+                        cleanup();
+                        resolve(doc.uri);
+                    }
+                }, 'awaitDocumentState.skipsValidation'))
+                : Disposable.create(() => undefined);
             const buildDisposable = this.onBuildPhase(DocumentState.Validated, () => {
-                if (document.state >= state) {
+                if (document.state >= state || (state === DocumentState.Validated && this.skipsValidation(document))) {
                     cleanup();
                     resolve(uri);
                 }
@@ -210,6 +309,7 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
             });
             const cleanup = () => {
                 phaseDisposable.dispose();
+                skipDisposable.dispose();
                 buildDisposable.dispose();
                 cancelDisposable.dispose();
             };
@@ -222,6 +322,20 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
             }
         });
     }
+    /**
+     * Whether the build that carries or last carried `document` has indexed its
+     * references, asks for validation, and still skips it, which is an override
+     * of `shouldValidate` excluding it. A build that does not ask for
+     * validation, such as the workspace's initial one, is not a skip: the next
+     * validating build validates the document. Nor is a document below
+     * `IndexedReferences`: the build writes its options before the first phase,
+     * so the document would pass for skipped before it is even parsed.
+     */
+    skipsValidation(document) {
+        return (document.state >= DocumentState.IndexedReferences &&
+            Boolean(this.getBuildOptions(document).validation) &&
+            !this.shouldValidate(document));
+    }
     /**
      * Whether no build will advance `document` to `state`, so a wait on it can
      * only be resolved by starting one.
@@ -250,14 +364,33 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
      * notification, so awaiting here would invert the dependency. A rejection is
      * logged rather than swallowed — it leaves the waiter pending until its own
      * cancellation token fires, which is worth a line in the log.
+     *
+     * The build is an ordinary {@link WorkspaceLock} write, entered from a read.
+     * The read waits until no write runs or is queued, so the build neither runs
+     * beside a locked one nor cancels the build a re-queue is fired from. Unlocked,
+     * it runs beside a locked build that cannot cancel it: both validate the same
+     * version and deliver it twice. Taking the write directly, without the read,
+     * cancels the running build and skips the rest of its build-phase listeners.
+     * The read must not await the write, which queues behind that read.
+     *
+     * A write that ran while the read waited may have carried the document to
+     * `state` already, and a second build would deliver that version again; the
+     * read skips the write then.
      */
     requeueOrphaned(document, state, reason) {
         const tracer = this.tracer.withUri(document.uri.toString());
         tracer.info(`Re-queuing orphaned document (at '${DocumentState[document.state]}', needs '${DocumentState[state]}'): ${reason}`);
-        this.update([document.uri], []).catch((err) => {
-            if (!isOperationCancelled(err)) {
-                tracer.error(`Re-queue build failed: ${err instanceof Error ? err.message : String(err)}`);
+        void this.workspaceLock.read(() => {
+            if (document.state >= state) {
+                return;
             }
+            this.workspaceLock
+                .write(token => this.update([document.uri], [], token))
+                .catch((err) => {
+                if (!isOperationCancelled(err)) {
+                    tracer.error(`Re-queue build failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            });
         });
     }
     /**
@@ -331,7 +464,22 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
         this.ensureLanguageFileExtensions();
         const changedURIs = changed.flatMap(uri => this.flattenAndAdaptURI(uri));
         const deletedURIs = deleted.flatMap(uri => this.collectDeletedURIs(uri));
-        return super.update(changedURIs, deletedURIs, cancelToken);
+        return this.runInSession({
+            kind: 'update',
+            trigger: this.buildTriggerLabel(changedURIs, deletedURIs),
+            triggerCountsDocs: changedURIs.length + deletedURIs.length !== 1,
+            changed: changedURIs,
+            deleted: deletedURIs
+        }, this.rebuildLabel(changedURIs, deletedURIs), () => super.update(changedURIs, deletedURIs, cancelToken));
+    }
+    /**
+     * The workspace-initialization entry point, bracketed by a session like
+     * {@link update}. Langium's `update` reaches `buildDocuments` directly rather
+     * than through here, so the two never nest.
+     */
+    build(documents, options, cancelToken) {
+        const uris = documents.map(document => document.uri);
+        return this.runInSession({ kind: 'build', trigger: `${documents.length} docs`, triggerCountsDocs: true, changed: uris, deleted: [] }, `Build documents (${documents.length} docs)`, () => super.build(documents, options, cancelToken));
     }
     /**
      * Refresh cross-document `ComputedScopes` derivations on cascade, when
@@ -528,6 +676,139 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
         ];
     }
     // ============================================================
+    // Build sessions — one rebuild as a correlated unit
+    // ============================================================
+    /**
+     * Open a session, run `body` inside it, and close it — the bracket every
+     * line of a rebuild is emitted within.
+     *
+     * The session is installed **synchronously**, before the timed body runs, so
+     * that state a subclass computed in {@link createBuildSession} is already
+     * readable by the time Langium's `update` consults `shouldRelink`.
+     *
+     * Teardown is preemption-correct, which is the reason this is framework code
+     * rather than a recipe. A build outside the workspace lock overlaps another:
+     * the later one installs itself as {@link activeSession} while the earlier
+     * one is still running, and the earlier one's `finally` runs LAST. Clearing
+     * unconditionally there would discard the later build's state mid-build.
+     * Only the session that is still current clears — and the check is
+     * reference equality on the session object,
+     * not on {@link BuildSession.traceId}, which is `undefined` for every build
+     * whenever the timing level is suppressed and would compare equal to itself
+     * across two different builds.
+     *
+     * Builds outside the lock are not hypothetical even without an adopter: the
+     * model service with `serializeBuilds` off starts one. Two locked builds
+     * never overlap, since the lock starts a write only once the write it
+     * cancelled has unwound.
+     */
+    runInSession(context, label, body) {
+        // Read before installing the new session: the id being superseded belongs
+        // to the OUTGOING build, or — when the previous one already finished
+        // cancelled — to the id it parked for its successor.
+        const supersededId = this.activeSession?.traceId ?? this.lastCancelledTraceId;
+        this.lastCancelledTraceId = undefined;
+        const reason = this.pendingUpdateReason;
+        this.pendingUpdateReason = undefined;
+        const tags = [];
+        if (reason) {
+            tags.push(`event: ${reason}`);
+        }
+        if (supersededId !== undefined) {
+            tags.push(`cancels #${supersededId}`);
+        }
+        const session = this.createBuildSession(context);
+        this.activeSession = session;
+        // A phase's "since previous phase" must measure from the build's start,
+        // not from whenever the last build's final phase happened to land.
+        this.lastPhaseMs = session.startMs;
+        return this.tracer.time(label, async () => {
+            try {
+                await body();
+            }
+            catch (err) {
+                if (isOperationCancelled(err)) {
+                    session.cancelled = true;
+                }
+                throw err;
+            }
+            finally {
+                this.endSession(session);
+            }
+        }, this.logLevel, {
+            logAfterMs: 0,
+            forceMemoryAboveMs: session.buffers ? session.detailThresholdMs : undefined,
+            captureId: id => {
+                session.traceId = id;
+            },
+            tags
+        });
+    }
+    /**
+     * Construct the session for one build. Override to return a
+     * {@link BuildSession} subclass carrying adopter build-scoped state — it is
+     * called before the build body, so anything derived here is readable
+     * throughout it.
+     */
+    createBuildSession(context) {
+        return new BuildSession(performance.now(), context.trigger, context.triggerCountsDocs, this.phaseDetailMs.value);
+    }
+    /**
+     * Close `session`: flush what it buffered, then release it if it is still the
+     * current one (see {@link runInSession} on why that check is conditional).
+     * The flush is unconditional — a preempted build's lines still describe work
+     * that happened.
+     */
+    endSession(session) {
+        this.flushSession(session);
+        if (this.activeSession === session) {
+            this.activeSession = undefined;
+            if (session.cancelled) {
+                this.lastCancelledTraceId = session.traceId;
+            }
+        }
+    }
+    /**
+     * Emit the lines `session` held back, if it ran long enough to be worth the
+     * detail; drop them otherwise. Emits through {@link emit} rather than
+     * {@link log}, which would route them straight back into the buffer.
+     */
+    flushSession(session) {
+        const elapsedMs = performance.now() - session.startMs;
+        if (elapsedMs >= session.detailThresholdMs) {
+            for (const line of session.bufferedLines) {
+                this.emit(line);
+            }
+        }
+        session.bufferedLines.length = 0;
+    }
+    /** Label for the build's own log line. Override to customise wording. */
+    rebuildLabel(changed, deleted) {
+        if (changed.length === 0 && deleted.length === 0) {
+            return 'Rebuild documents (nothing to do)';
+        }
+        if (changed.length === 1 && deleted.length === 0) {
+            return `Rebuild document: ${this.formatUri(changed[0])}`;
+        }
+        if (changed.length === 0 && deleted.length === 1) {
+            return `Rebuild after delete: ${this.formatUri(deleted[0])}`;
+        }
+        return `Rebuild documents (${changed.length} changed, ${deleted.length} deleted)`;
+    }
+    /** Short description of what triggered the build, repeated on every phase line. Override to customise wording. */
+    buildTriggerLabel(changed, deleted) {
+        if (changed.length === 0 && deleted.length === 0) {
+            return 'nothing';
+        }
+        if (changed.length === 1 && deleted.length === 0) {
+            return this.formatUri(changed[0]);
+        }
+        if (changed.length === 0 && deleted.length === 1) {
+            return `deleted ${this.formatUri(deleted[0])}`;
+        }
+        return `${changed.length} changed, ${deleted.length} deleted`;
+    }
+    // ============================================================
     // Logging — phase-reached listeners
     // ============================================================
     registerPhaseListeners() {
@@ -540,15 +821,37 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
         const now = performance.now();
         const elapsedMs = Math.round(now - this.lastPhaseMs);
         this.lastPhaseMs = now;
+        // Counted before the line is formatted, so the formatter stays a pure
+        // function of state a caller can also set up in a test.
+        if (this.activeSession) {
+            this.activeSession.phasesLogged++;
+        }
         this.log(this.phaseReachedLine(state, documents, elapsedMs));
     }
-    /** Format the phase-reached log line. Override to customise wording. */
+    /**
+     * Format the phase-reached log line. Override to customise wording.
+     *
+     * Within a session the line names what triggered the build, so a phase read
+     * in isolation still says which rebuild it belongs to. `elapsedMs` is ignored
+     * for the FIRST phase of a session: it measures from the previous build's
+     * last phase, an idle gap that says nothing about this build.
+     */
     phaseReachedLine(state, documents, elapsedMs) {
-        const docInfo = documents.length === 1 ? this.formatUri(documents[0].uri) : `${documents.length} docs`;
-        return `Reached phase '${DocumentState[state]}' [${docInfo}, ${elapsedMs}ms since previous phase]`;
+        const session = this.activeSession;
+        let docInfo;
+        if (session) {
+            docInfo = session.triggerCountsDocs ? `building ${session.trigger}` : `building ${session.trigger}, ${documents.length} docs`;
+        }
+        else {
+            docInfo = documents.length === 1 ? this.formatUri(documents[0].uri) : `${documents.length} docs`;
+        }
+        const elapsedInfo = session && session.phasesLogged <= 1
+            ? `${Math.round(performance.now() - session.startMs)}ms since build start`
+            : `${elapsedMs}ms since previous phase`;
+        return `Reached phase '${DocumentState[state]}' [${docInfo}, ${elapsedInfo}]`;
     }
     // ============================================================
-    // Logging — slow-listener breakdown on notifyDocumentPhase
+    // notifyDocumentPhase — the delivery hook and the slow-listener breakdown
     // ============================================================
     async notifyDocumentPhase(document, state, cancelToken) {
         // Before the listeners, one of which is Langium's diagnostics publisher.
@@ -558,16 +861,15 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
         // build settling inside that window therefore appends after this call has
         // already deduped, and the appended duplicate is published by the listener
         // of the build that deduped. Only `serializeBuilds` closes the window.
+        //
+        // Dedupe before rendering: rendering is deterministic, so it cannot
+        // change which entries are structurally equal, and fewer survive to render.
         if (state === DocumentState.Validated) {
             this.dedupeDiagnostics(document);
-        }
-        if (this.logLevel === 'off') {
-            return super.notifyDocumentPhase(document, state, cancelToken);
+            this.renderDiagnostics(document);
         }
         const listeners = this.documentPhaseListeners.get(state).slice();
-        if (listeners.length === 0) {
-            return;
-        }
+        const version = document.textDocument.version;
         const perListenerMs = [];
         let cancelledListeners = 0;
         const { elapsedMs: totalMs } = await this.clock.measure(async () => {
@@ -587,6 +889,14 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
                 perListenerMs.push(elapsedMs);
             }
         });
+        if (cancelledListeners === 0) {
+            for (const delivered of this.documentPhaseDeliveredListeners.get(state).slice()) {
+                delivered(document, version);
+            }
+        }
+        if (this.logLevel === 'off' || listeners.length === 0) {
+            return;
+        }
         if (cancelledListeners > 0) {
             this.tracer
                 .withUri(document.uri.toString())
@@ -718,11 +1028,83 @@ export class HydraniumDocumentBuilder extends DefaultDocumentBuilder {
             document.diagnostics = unique;
         }
     }
+    /**
+     * Render every diagnostic on `document` through the bound message renderer,
+     * in ONE pass over the finished list.
+     *
+     * All three heads read `document.diagnostics` — the LSP publish,
+     * `TransferEncoder.toTransferDiagnostic` and the GLSP validation path — so
+     * one pass here is what keeps the render from happening per head. It is also
+     * the only placement that covers lexer and parser errors, which Langium
+     * pushes onto the document without routing them through `toDiagnostic`.
+     *
+     * Running here rather than from a `Validated` phase listener needs no
+     * ordering assumption: Langium publishes from `addDiagnosticsHandler`, a free
+     * function it registers as such a listener, which can only be outrun.
+     *
+     * **It inherits {@link dedupeDiagnostics}'s window, and therefore the same
+     * precondition.** A build settling inside the listener window appends
+     * diagnostics this pass never saw, and the publisher of the build that
+     * rendered sends them — unrendered. `ModelServiceOptions.serializeBuilds`
+     * closes it and defaults to `true`, so "every diagnostic is rendered" holds
+     * by default and is an opt-out rather than a guarantee. Opting out accepts
+     * unrendered diagnostics on exactly the terms it already accepts duplicates.
+     *
+     * Entries are REPLACED rather than mutated: `sendDiagnostics` passes the
+     * array by reference and serialises later, so an in-place message mutation
+     * reaches the wire even when it runs after the publisher — which would make
+     * a test for the ordering pass in either state.
+     */
+    renderDiagnostics(document) {
+        const diagnostics = document.diagnostics;
+        if (!diagnostics || diagnostics.length === 0) {
+            return;
+        }
+        let changed = false;
+        // No try/catch: `renderDiagnostic` carries a no-throw contract, because an
+        // error escaping this phase strands the document at `Validated` with
+        // Langium's publisher never invoked.
+        const rendered = diagnostics.map(diagnostic => {
+            const text = this.messageRenderer.renderDiagnostic(diagnostic);
+            // Against the message's STRING FORM, not the field. `renderDiagnostic`
+            // answers a `string` by contract, while `Diagnostic.message` is
+            // `string | MarkupContent` since LSP 3.17 — so comparing the answer
+            // against the field never matches for a markup message, and a pass
+            // that replaced on mismatch flattened every un-identified markup
+            // diagnostic to its own plain text. That is silent data loss on the
+            // path whose whole job is to leave such entries alone.
+            if (text === Diagnostic.getMessageString(diagnostic)) {
+                return diagnostic;
+            }
+            changed = true;
+            return { ...diagnostic, message: text };
+        });
+        if (changed) {
+            document.diagnostics = rendered;
+        }
+    }
     // ============================================================
     // Internal helpers
     // ============================================================
-    /** Dispatch a log line at the configured log level; a no-op when `logLevel === 'off'`. */
+    /**
+     * Dispatch a log line at the configured log level; a no-op when `logLevel ===
+     * 'off'`.
+     *
+     * Held on the active session when it buffers, so the "was this build worth a
+     * per-phase breakdown" decision — which needs the build's total duration, and
+     * so cannot be taken by anything that runs while the lines are produced — is
+     * deferred to {@link flushSession}.
+     */
     log(message) {
+        const session = this.activeSession;
+        if (session?.buffers) {
+            session.bufferedLines.push(message);
+            return;
+        }
+        this.emit(message);
+    }
+    /** Write a line out, bypassing session buffering. The single sink every framework log line reaches. */
+    emit(message) {
         this.tracer.logAt(this.logLevel, message);
     }
 }