@hydranium/core 1.0.0-next.17 → 1.0.0-next.174

package/src/langium/module.ts

@@ -8,30 +8,41 @@
  ********************************************************************************/
 
 import { type Clock, type Logger, type Project, type Tracer, type TransferDiagnostic, NoopLogger, SystemClock } from '@hydranium/protocol';
+import { DefaultServerLocale, type ServerLocale } from '../locale/server-locale.js';
+import { DefaultMessageRenderer, type MessageRenderer } from '../messages/renderer.js';
 import { ServerTracer } from './diagnostics/server-tracer.js';
 import { HydraniumLangiumProfiler } from './diagnostics/hydranium-langium-profiler.js';
 import { type AstNode, type Module } from '@hydranium/langium';
 import { type DefaultSharedModuleContext, type LangiumSharedServices, type PartialLangiumSharedServices } from '@hydranium/langium/lsp';
 import { type TextDocument } from 'vscode-languageserver-textdocument';
-import { ModelService } from './model-service/model-service.js';
+import { type ClientSessionFactory, DefaultClientSessionFactory } from './model-service/client-session.js';
+import { DefaultModelService, type ModelService } from './model-service/model-service.js';
 import { type ProjectManager } from './project/project-manager.js';
 import { SingleProjectManager } from './project/single-project-manager.js';
-import { TransferEncoder } from './transfer/transfer-encoder.js';
+import { DefaultTransferEncoder, type TransferEncoder } from './transfer/transfer-encoder.js';
 import { HydraniumDocumentBuilder } from './document-builder/document-builder.js';
-import { BuildPipelineIntegration } from './document-builder/build-pipeline-integration.js';
+import { DefaultBuildPipelineIntegration, type BuildPipelineIntegration } from './document-builder/build-pipeline-integration.js';
 import { type BuildPhasePassContribution } from './build-phase-pass/build-phase-pass.js';
 import { type BuildPhasePassService, DefaultBuildPhasePassService } from './build-phase-pass/build-phase-pass-service.js';
-import { CstResidencyService } from './residency/index.js';
+import { DefaultCstResidencyService, type CstResidencyService } from './residency/index.js';
+import { HydraniumConfigurationProvider } from './config/configuration-provider.js';
 import { HydraniumIndexManager } from './workspace/index-manager.js';
 import { HydraniumWorkspaceManager } from './workspace/hydranium-workspace-manager.js';
 import { HydraniumWorkspaceLock } from './workspace/hydranium-workspace-lock.js';
 import { HydraniumLangiumDocumentFactory } from './workspace/hydranium-langium-document-factory.js';
+import { type HydraniumDocumentRegistry, HydraniumLangiumDocuments } from './workspace/langium-documents.js';
 import { type AdditionalDocumentContribution } from './workspace/additional-document-contribution.js';
 import { DefaultDocumentUriPolicy, type DocumentUriPolicy } from './workspace/document-uri-policy.js';
 import { HydraniumTextDocuments } from '../documents/hydranium-text-documents.js';
-import { AstDocumentManager, type WritableFileSystemProvider } from '../documents/ast-document-manager.js';
-import { SelfSaveRegistry } from '../documents/self-save-registry.js';
-import { DefaultEmptyFileSystemProvider } from './workspace/file-system-provider.js';
+import { DefaultAstDocumentManager, type AstDocumentManager, type WritableFileSystemProvider } from '../documents/ast-document-manager.js';
+import { DefaultSelfSaveRegistry, type SelfSaveRegistry } from '../documents/self-save-registry.js';
+import { DefaultFileSystemTaskQueue, type FileSystemTaskQueue } from '../documents/file-system-task-queue.js';
+import {
+   DefaultEmptyFileSystemProvider,
+   DefaultFileSystemProviderRegistry,
+   type FileSystemProviderRegistry
+} from './workspace/file-system-provider.js';
+import { VIRTUAL_SCHEME, VirtualFileSystemProvider } from './workspace/virtual-document.js';
 import { type ServerLanguageServices } from './language-module.js';
 import { ExtendedServiceRegistry } from './service-registry.js';
 
@@ -43,7 +54,10 @@ import { ExtendedServiceRegistry } from './service-registry.js';
  * these shared services; per-head shared bindings, if any, are
  * contributed by additional modules layered after this one.
  */
-export interface ServerAddedSharedServices<TProject extends Project = Project> {
+export interface ServerAddedSharedServices<
+   TProject extends Project = Project,
+   TDiagnostic extends TransferDiagnostic = TransferDiagnostic
+> {
    /**
     * Injectable time source. Framework default is {@link SystemClock} (real
     * `Date.now` / `performance.now` / `setTimeout`); tests bind a fake to
@@ -91,6 +105,24 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * plain `DefaultTracer` with their own `MemoryReader`.
     */
    Tracer: Tracer;
+   /**
+    * Renders each user-facing message once, before the server sends it — so
+    * every message is rendered by the side that knows the reading user's
+    * language. All three heads inherit one diagnostics pass, which is what
+    * makes this the single slot an adopter with i18n rebinds; the same binding
+    * serves framework codes and their own `defineMessage` codes alike.
+    *
+    * The framework ships English only and selects no locale, so the default
+    * returns every sentence unchanged. Adopters subclass and override
+    * `translationsFor`.
+    */
+   MessageRenderer: MessageRenderer;
+   /**
+    * The locale an init handed the server, for whoever renders in it. Held
+    * apart from the renderer so replacing the renderer cannot drop locale
+    * handling.
+    */
+   ServerLocale: ServerLocale;
    /**
     * LSP-bound slots layered on top of Langium's `LangiumSharedLSPServices`.
     * The framework contributes a single string slot here —
@@ -113,6 +145,12 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
    workspace: {
       /* override */ TextDocuments: HydraniumTextDocuments<TextDocument>;
       /* override */ WorkspaceManager: HydraniumWorkspaceManager;
+      /**
+       * Narrow Langium's registry slot to the framework surface, which adds
+       * `createEmptyDocument` — reachable only through this narrowing, and
+       * wanted by a scope provider querying a URI before the file exists.
+       */
+      /* override */ LangiumDocuments: HydraniumDocumentRegistry;
       /**
        * Narrow Langium's `IndexManager` slot to the framework subclass, which
        * layers an `elementsByName` map over Langium's index and exposes
@@ -127,12 +165,11 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        * the `awaitDocumentState` bug-fix, framework-wired phase logs,
        * and the `markNextReason` observability primitive without
        * binding the slot explicitly. The
-       * `HydraniumDocumentUpdateHandler`'s `dispatch` calls this
-       * slot's `markNextReason` to stage the LSP event that triggered
-       * the build, for a subclass's build logging to tag its line with,
-       * so narrowing here is a load-bearing type contract — adopters who
-       * explicitly downgrade to Langium's default lose that call site's
-       * compile-time target.
+       * `HydraniumDocumentUpdateHandler`'s `dispatch` and
+       * `ModelService.rebuild` build through this slot's
+       * `scheduleUpdate`, so narrowing here is a load-bearing contract:
+       * a builder without it fails every LSP-driven build, and every
+       * session write that takes the lock, at run time.
        */
       /* override */ DocumentBuilder: HydraniumDocumentBuilder;
       /**
@@ -146,20 +183,36 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        */
       /* override */ WorkspaceLock: HydraniumWorkspaceLock;
       /**
-       * Tighten Langium's read-only `FileSystemProvider` slot to
-       * {@link WritableFileSystemProvider}. The framework's save path
-       * ({@link AstDocumentManager.save}, integrity corrections,
-       * `ModelService.save`) requires write semantics — a read-only slot
-       * type forces an `as WritableFileSystemProvider` cast at the binding
-       * line and defers the failure of a read-only implementation to the
-       * first save. The `.`-entry default is
-       * {@link DefaultEmptyFileSystemProvider}, which is what keeps the core
-       * barrel free of `node:fs` and therefore browser-bundleable; a Node host
-       * binds `@hydranium/core/node`'s Node-backed provider (wired to
-       * {@link SelfSaveRegistry}) instead, and adopters override with their own
+       * Tighten Langium's read-only `FileSystemProvider` slot to a
+       * {@link FileSystemProviderRegistry}, which is writable: the
+       * framework's save path ({@link AstDocumentManager.save}, integrity
+       * corrections, a session's `save`) requires write semantics, and a
+       * read-only slot type defers the failure of a read-only
+       * implementation to the first save.
+       *
+       * Bound to {@link DefaultFileSystemProviderRegistry}, which dispatches
+       * by scheme to the {@link ServerAddedSharedServices.fileSystemProviders}
+       * group and sends every other scheme to its `host`: the provider
+       * `context.fileSystemProvider` returns when it is writable, or else
+       * `DefaultEmptyFileSystemProvider`, which is what keeps the core
+       * barrel free of `node:fs` and therefore browser-bundleable. A Node
+       * host passes `@hydranium/core/node`'s Node-backed provider (wired to
+       * {@link SelfSaveRegistry}) instead, and adopters pass their own
        * writable implementation when neither fits.
+       *
+       * To reach the members of its own provider, an adopter declares this
+       * slot as `FileSystemProviderRegistry<MyProvider>` through
+       * {@link WithServiceOverrides}, binds a
+       * `DefaultFileSystemProviderRegistry` with that host from a factory
+       * whose return type names the narrowed slot (a module's `DeepPartial`
+       * checks no host member otherwise), and reads
+       * `FileSystemProvider.host`. A
+       * registry that serves a seeded document under none of its providers
+       * loses the document at its last close, which
+       * {@link HydraniumWorkspaceManager.warnIfDocumentsUnserved} reports
+       * once at startup.
        */
-      /* override */ FileSystemProvider: WritableFileSystemProvider;
+      /* override */ FileSystemProvider: FileSystemProviderRegistry;
       ProjectManager: ProjectManager<TProject>;
       SelfSaveRegistry: SelfSaveRegistry;
       /**
@@ -188,7 +241,13 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        * that need to narrow the diagnostic type or override lifecycle
        * behaviour rebind this slot with a subclass.
        */
-      AstDocumentManager: AstDocumentManager<AstNode, unknown>;
+      AstDocumentManager: AstDocumentManager<AstNode>;
+      /**
+       * Orders the server's disk accesses of each file. One slot for every
+       * reader and writer: a service given a queue of its own does not order
+       * against the others.
+       */
+      FileSystemTaskQueue: FileSystemTaskQueue;
       /**
        * Wires the framework's build-time features (integrity, AST
        * enrichment) into Langium's build pipeline: owns the build-phase
@@ -228,15 +287,25 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * heads read both slots from shared services rather than constructor
     * arguments.
     *
-    * Slot types use the upper bounds (`unknown` for encoder map / facade
-    * generics, {@link TransferDiagnostic} for the encoder's wire-diagnostic
-    * shape) so adopter subclasses with narrower typed overlays satisfy
-    * the slot via output-position covariance — `TDiagnostic` appears
-    * only in encoder return positions.
+    * `TransferEncoder` is the INTERFACE, not `DefaultTransferEncoder` — an
+    * adopter can therefore REPLACE this declaration (see
+    * {@link WithServiceOverrides}) rather than intersect with it, which is what
+    * keeps slot resolution independent of the order a services type is written
+    * in. `ModelService` is an interface for the same reason.
+    *
+    * A class in a slot costs two things, both measured. Its `protected` members
+    * join every assignability check and are compared NOMINALLY, so a subclass
+    * declared against a second physical copy of this package cannot satisfy it.
+    * And where the class is generic over a map reached through `keyof`, that
+    * parameter is measured INVARIANT — instantiations then relate only when
+    * their arguments are mutually assignable, which no adopter map is with the
+    * framework's. Neither survives on an interface.
     */
    model: {
-      TransferEncoder: TransferEncoder<unknown, TransferDiagnostic>;
-      ModelService: ModelService<AstNode, unknown>;
+      TransferEncoder: TransferEncoder<TDiagnostic>;
+      ModelService: ModelService<AstNode>;
+      /** Builds the handle of every session `ModelService.createSession` starts. */
+      ClientSessionFactory: ClientSessionFactory;
    };
    /**
     * Shared contribution group for batch-level build-phase passes (see
@@ -259,6 +328,15 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * contribute none never touch it.
     */
    additionalDocuments: Record<string, AdditionalDocumentContribution>;
+   /**
+    * Shared contribution group of file system providers keyed by the URI
+    * scheme each answers for, which {@link FileSystemProviderRegistry}
+    * dispatches to. The framework registers {@link VirtualFileSystemProvider}
+    * under `virtual`; an adopter deep-merges a provider for a scheme of its
+    * own, and an entry under `virtual` replaces the framework's. A scheme with
+    * no entry goes to the registry's `host`.
+    */
+   fileSystemProviders: Record<string, WritableFileSystemProvider>;
 }
 
 /**
@@ -274,10 +352,57 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
  * `ClientTextDocumentChangeEvent` payload (with `clientId`);
  * `ServiceRegistry.getServices(uri)` keeps the
  * {@link ServerLanguageServices} return shape.
+ *
+ * `TDiagnostic` is the diagnostic the bound `model.TransferEncoder` emits. A
+ * head that sends a narrower diagnostic than `TransferDiagnostic` takes
+ * services typed with it, so none of its envelopes claims a shape the encoder
+ * does not produce.
  */
-export type ServerSharedServices<TProject extends Project = Project> = Omit<LangiumSharedServices, 'workspace' | 'ServiceRegistry'> & {
+export type ServerSharedServices<TProject extends Project = Project, TDiagnostic extends TransferDiagnostic = TransferDiagnostic> = Omit<
+   LangiumSharedServices,
+   'workspace' | 'ServiceRegistry'
+> & {
    workspace: Omit<LangiumSharedServices['workspace'], 'TextDocuments' | 'DocumentBuilder'>;
-} & ServerAddedSharedServices<TProject>;
+} & ServerAddedSharedServices<TProject, TDiagnostic>;
+
+/**
+ * The service-tree namespaces — the keys whose value groups further slots
+ * rather than being a slot itself.
+ *
+ * Consumed by {@link WithServiceOverrides} to know where to merge one level
+ * deeper. **Add a namespace to {@link ServerAddedSharedServices} and you must
+ * add it here**, and the failure of forgetting is silent in the direction that
+ * matters: an unlisted namespace is treated as a leaf, so an adopter overriding
+ * one slot inside it replaces the WHOLE namespace and loses the sibling slots
+ * with no diagnostic. The reverse mistake — listing a leaf — fails loudly.
+ */
+type ServiceNamespace = 'lsp' | 'workspace' | 'model';
+
+/**
+ * Compose an adopter's service tree so its declarations REPLACE the framework's
+ * rather than intersecting with them.
+ *
+ * Langium composes services by intersection, which accumulates: two
+ * declarations of one slot survive as an overload set, and which one a call
+ * resolves to depends on the order the intersection was written in — silently,
+ * with no diagnostic at the point a reorder changes it. There is no override
+ * operator for intersections, so the framework's declaration has to be removed
+ * before the adopter's is added. This does that, one level deep for each
+ * {@link ServiceNamespace}, so a narrowed slot replaces its framework twin
+ * while its siblings survive.
+ *
+ * Only slots typed as INTERFACES can be replaced this way. A class-typed slot
+ * drags its `protected` members into the assignability check — compared
+ * nominally — so an adopter subclass does not satisfy it and the framework's
+ * declaration cannot be dropped.
+ */
+export type WithServiceOverrides<TBase, TOverrides> = Omit<TBase, keyof TOverrides> & {
+   [K in keyof TOverrides]: K extends ServiceNamespace
+      ? K extends keyof TBase
+         ? Omit<TBase[K], keyof TOverrides[K]> & TOverrides[K]
+         : TOverrides[K]
+      : TOverrides[K];
+};
 
 /**
  * Construction context for {@link createServerSharedModule}.
@@ -327,6 +452,8 @@ export function createServerSharedModule(
       ServiceRegistry: services => new ExtendedServiceRegistry<ServerLanguageServices>(services),
       Logger: () => new NoopLogger(),
       Tracer: services => new ServerTracer(services.Logger, services.Clock),
+      ServerLocale: services => new DefaultServerLocale(services),
+      MessageRenderer: services => new DefaultMessageRenderer(services),
       // Bind Langium's per-grammar-rule / per-`$type` parse/link/validate
       // profiler (the data the framework's own `Tracer`/`ProfileSession` passes
       // cannot produce), routed through our `Logger` and debug-gated. At the
@@ -388,59 +515,61 @@ export function createServerSharedModule(
          TextDocuments: services => new HydraniumTextDocuments(services),
          WorkspaceManager: services => new HydraniumWorkspaceManager(services),
          IndexManager: services => new HydraniumIndexManager(services),
+         // Langium's default asks only about sections named after registered
+         // language ids, so a section `lsp.configurationRoot` is bound to reads
+         // `undefined` forever with no request on the wire.
+         ConfigurationProvider: services => new HydraniumConfigurationProvider(services),
          // Override Langium's factory so a `fromModel` (code-built) virtual
          // document retains serialized text via the per-language Serializer,
-         // making it re-read-safe through the virtual-aware FileSystemProvider.
+         // making it re-read-safe through `VirtualFileSystemProvider`.
          LangiumDocumentFactory: services => new HydraniumLangiumDocumentFactory(services),
+         // Langium's default routes through no identity seam and treats every
+         // failed load alike, so leaving this unbound opts a server out of both
+         // with nothing to signal it.
+         LangiumDocuments: services => new HydraniumLangiumDocuments(services),
          DocumentBuilder: services => new HydraniumDocumentBuilder(services),
          // The write-lock scope this marks is inert unless a host installs a
          // scope tracker — `@hydranium/core/node` does.
-         WorkspaceLock: () => new HydraniumWorkspaceLock(),
+         WorkspaceLock: services => new HydraniumWorkspaceLock(services),
          ProjectManager: services => new SingleProjectManager(services),
-         SelfSaveRegistry: services => new SelfSaveRegistry(services),
+         SelfSaveRegistry: services => new DefaultSelfSaveRegistry(services),
          DocumentUriPolicy: () => new DefaultDocumentUriPolicy(),
-         // Writable filesystem with two paths:
-         // - Adopter passed `context.fileSystemProvider` and it returned a
-         //   writable implementation (has `writeFile`) — use it. Honours the
-         //   Langium-conventional context channel for passing a custom backing
-         //   (in-memory, browser, test stub like `DefaultEmptyFileSystemProvider`).
-         // - Otherwise — the portable default `DefaultEmptyFileSystemProvider`
-         //   (no-op writes, no disk access). Node hosts opt into real disk I/O
-         //   by binding `@hydranium/core/node`'s `DefaultFileSystemProvider`
-         //   (Node-backed, wired to `SelfSaveRegistry` so framework `writeFile`
-         //   calls register their mtime and adopters can suppress the
-         //   `didChangeWatchedFiles` echo) — typically via this same
-         //   `context.fileSystemProvider` channel or by rebinding
-         //   the slot. Keeping the `.`-entry default empty is what lets the
-         //   core barrel stay free of `node:fs` (browser-bundleable); see the
-         //   `@hydranium/core/node` carve.
+         // The host is the provider `context.fileSystemProvider` returns
+         // when it is writable (has `writeFile`); anything narrower gets the
+         // empty provider, which is what keeps the core barrel free of
+         // `node:fs`.
          FileSystemProvider: services => {
             const fromContext = context.fileSystemProvider?.(services);
-            if (fromContext && typeof (fromContext as Partial<WritableFileSystemProvider>).writeFile === 'function') {
-               return fromContext as WritableFileSystemProvider;
-            }
-            return new DefaultEmptyFileSystemProvider(services);
+            const writable = typeof (fromContext as Partial<WritableFileSystemProvider> | undefined)?.writeFile === 'function';
+            return new DefaultFileSystemProviderRegistry(services, {
+               host: writable ? (fromContext as WritableFileSystemProvider) : new DefaultEmptyFileSystemProvider(services)
+            });
          },
-         AstDocumentManager: services => new AstDocumentManager(services),
+         AstDocumentManager: services => new DefaultAstDocumentManager(services),
+         FileSystemTaskQueue: services => new DefaultFileSystemTaskQueue(services),
          // Eagerly constructed, so its build-phase listeners attach before the
          // first build.
-         BuildPipelineIntegration: services => new BuildPipelineIntegration(services),
+         BuildPipelineIntegration: services => new DefaultBuildPipelineIntegration(services),
          BuildPhasePassService: services => new DefaultBuildPhasePassService(services),
          // Eagerly constructed, so its `Validated` pass registers before the
          // first build.
-         CstResidencyService: services => new CstResidencyService(services)
+         CstResidencyService: services => new DefaultCstResidencyService(services)
       },
       model: {
          // Generic walker — adopters with a typed `$type → wire shape` overlay
          // rebind this slot with a subclass.
-         TransferEncoder: services => new TransferEncoder(services),
-         ModelService: services => new ModelService(services)
+         TransferEncoder: services => new DefaultTransferEncoder(services),
+         ModelService: services => new DefaultModelService(services),
+         ClientSessionFactory: services => new DefaultClientSessionFactory(services)
       },
       // Empty default so `services.buildPhasePasses` always resolves (Langium
       // throws on access to an unbound slot). The framework's own integrity /
       // profiler passes self-register imperatively, not here.
       buildPhasePasses: {},
       // Empty default so `services.additionalDocuments` always resolves.
-      additionalDocuments: {}
+      additionalDocuments: {},
+      fileSystemProviders: {
+         [VIRTUAL_SCHEME]: services => new VirtualFileSystemProvider(services)
+      }
    };
 }

package/src/langium/naming/name-provider.ts

@@ -59,6 +59,16 @@ export interface NameProviderOptions {
     * an `id` field) override explicitly; the explicit override at
     * the adopter side documents the grammar's convention rather than
     * burying it in a framework default.
+    *
+    * **The override is not optional where `name` is a display LABEL rather
+    * than an identifier**, and getting it wrong is quiet at first and then
+    * loud. A `name=STRING` holding `"Order.Line"` is legitimate content, but
+    * the default reads it as the identifier: `getName` composes a qualified
+    * name whose segments cannot be told apart from the label's own dots, and
+    * `nameSeparatorCheck` reports `hydranium/core/separator-in-name` on every
+    * such node. That diagnostic then names the wrong remedy — it asks for a
+    * different character, when the fix is to point this option at the property
+    * that really is the identifier.
     */
    readonly nameProperties?: readonly string[];
 }
@@ -244,10 +254,21 @@ export interface NameProvider extends LangiumNameProvider {
    /**
     * Find a unique name for a new node within `container`, using `base`
     * as a stem. Walks the AST subtree rooted at `container` and avoids
-    * names already used by `$type === type` nodes there. Default
-    * generates `${base}1`, `${base}2`, ... until an unused value is
-    * found. Used by create-element operation handlers when the
-    * uniqueness scope is one AST subtree.
+    * names already held there by nodes of `type` or of any subtype of it,
+    * as `AstReflection.isSubtype` reports. Default generates `${base}1`,
+    * `${base}2`, ... until an unused value is found. Used by create-element
+    * operation handlers when the uniqueness scope is one AST subtree.
+    *
+    * Subtype-closed rather than `$type`-exact, because a name space shared by
+    * several concrete types is named by their common supertype and by no
+    * concrete type at all — the shape a cross-reference whose target type is
+    * that supertype produces. An exact filter finds no collisions for such a
+    * call and returns the proposal unchanged, which a caller cannot tell from
+    * a name that was genuinely free.
+    * {@link NameProvider.findNextDocumentQualifiedName} and
+    * {@link NameProvider.findNextProjectQualifiedName} resolve `type` the same
+    * way, through `IndexManager.allElements`, so one type argument does not
+    * mean different sets at different tiers.
     */
    findNextName(type: string, base: string, container: AstNode): string;
 
@@ -486,8 +507,9 @@ export class DefaultNameProvider implements NameProvider {
 
    findNextName(type: string, base: string, container: AstNode): string {
       const proposal = base.replaceAll(this.nameSeparator, '_');
+      const reflection = this.services.shared.AstReflection;
       const knownNames = AstUtils.streamAst(container)
-         .filter(node => node.$type === type)
+         .filter(node => reflection.isSubtype(node.$type, type))
          .map(node => this.getOwnName(node))
          .nonNullable()
          .toArray();

package/src/langium/naming/name-separator-validation.ts

@@ -8,10 +8,39 @@
  ********************************************************************************/
 
 import { type AstNode, type ValidationAcceptor, type ValidationChecks } from '@hydranium/langium';
+import { defineMessage } from '@hydranium/protocol';
+import { acceptMessage } from '../../messages/carriers.js';
 import { type ServerLanguageServices } from '../language-module.js';
 import { type ValidationCheckContribution, type ValidationCheckRegistry } from '../validation/validation-contribution.js';
 import type { NameProvider } from './name-provider.js';
 
+/**
+ * A name value that collides with the qualified-name separator.
+ *
+ * **The sentence addresses a MODELLER, and the remedy it names is theirs**:
+ * where `name` really is the identifier, a different character is the fix and
+ * the only one available to whoever is typing.
+ *
+ * **The adopter-facing failure is a different one, and this message cannot
+ * carry it.** With `nameProperties` left at its default `['name']` over a
+ * grammar where `name` is a display LABEL — a `STRING` legitimately holding
+ * `"Order.Line"` — this fires on every dotted label at once, and "use a
+ * different character" is then advice nobody can act on: the content is
+ * correct and the configuration is not. A burst of this diagnostic across
+ * unrelated nodes is that misconfiguration, not a naming problem, and the fix
+ * is `nameProperties`. Widening the sentence to say both was rejected: a
+ * modeller cannot act on a DI option, and naming one in an editor squiggle
+ * teaches the wrong audience.
+ *
+ * Unreachable from a grammar whose identifier charset excludes the separator,
+ * which is every example here and the reference adopter — so it reads as dead
+ * and is not: it guards the configuration, not the content.
+ */
+export const SEPARATOR_IN_NAME = defineMessage(
+   'hydranium/core/separator-in-name',
+   "Name '{name}' contains the configured name separator '{separator}', which is reserved for qualified-name composition — use a different character."
+);
+
 /**
  * Per-node validation check: flag name-bearing AST nodes whose name
  * value contains the configured name separator. Such values produce
@@ -38,11 +67,11 @@ export function nameSeparatorCheck(nameProvider: NameProvider): (node: AstNode,
       }
       const separator = nameProvider.nameSeparator;
       if (ownName.includes(separator)) {
-         accept(
-            'error',
-            `Name '${ownName}' contains the configured name separator '${separator}', which is reserved for qualified-name composition — use a different character.`,
-            { node }
-         );
+         // `{ node }` rather than `{ node, property: 'name' }`: moving the
+         // squiggle onto the name property is a behaviour change to the one
+         // diagnostic every adopter receives by default, so it is decided on its
+         // own merits rather than carried in by a mechanical migration.
+         acceptMessage(accept, 'error', SEPARATOR_IN_NAME, { node }, { name: ownName, separator });
       }
    };
 }

package/src/langium/project/abstract-project-manager.ts

@@ -12,13 +12,14 @@ import {
    type AstNode,
    AstUtils,
    type DocumentBuilder,
+   DocumentState,
    type FileSystemProvider,
    type LangiumDocument,
    type LangiumDocuments,
    type URI,
    UriUtils
 } from '@hydranium/langium';
-import { Disposable } from 'vscode-languageserver';
+import { CancellationToken, Disposable } from 'vscode-languageserver';
 import type { WorkspaceFolder } from 'vscode-languageserver-types';
 import type { LogNameOptions } from '../diagnostics/logger.js';
 import { type ServerSharedServicesMinimal } from '../shared-services.js';
@@ -377,6 +378,13 @@ export abstract class AbstractProjectManager<TProject extends Project = Project>
    protected async loadDescriptor(uri: URI): Promise<TProject | undefined> {
       try {
          const document = await this.langiumDocuments.getOrCreateDocument(uri);
+         if (document.state < DocumentState.Parsed) {
+            // `onUpdate` fires before the build parses, so the AST is still the previous edit's.
+            // The state is restored so the build still runs, and notifies, its own parse phase.
+            const state = document.state;
+            await this.services.workspace.LangiumDocumentFactory.update(document, CancellationToken.None);
+            document.state = state;
+         }
          const project = await this.parseProjectDescriptor(uri, document);
          if (project) {
             this.projects.set(project.id, project);

package/src/langium/project/project-change-event.ts

@@ -28,8 +28,8 @@ import type { URI } from '@hydranium/langium';
  * - {@link affectedDocuments} lists URIs whose reachable scope changed. The
  *   default cascade plumbing in `HydraniumWorkspaceManager` subscribes to
  *   this event and re-runs `DocumentBuilder.resetToState` for each entry,
- *   which the next build cycle picks up. Consumers can subscribe
- *   independently for other reactions.
+ *   which the build of the update that changed the descriptor picks up.
+ *   Consumers can subscribe independently for other reactions.
  */
 export interface ProjectChangeEvent<TProject extends Project = Project> {
    /** Ids of projects newly registered since the last event. */

package/src/langium/residency/cst-residency-service.ts

@@ -24,9 +24,13 @@ import { type ServerSharedServicesMinimal } from '../shared-services.js';
 /**
  * Default priority of the CST-residency pass. Deliberately very high so it runs
  * *last* among `Validated` build-phase passes (the registry iterates priority
- * ascending): every other reaction to the build — an adopter's own derived-state
- * pass included — settles while the CST is still guaranteed resident, before the
- * residency policy arms the shed.
+ * ascending).
+ *
+ * The ordering is defensive, not load-bearing: the pass only arms or cancels an
+ * idle timer, so every pass at `Validated` reads a resident CST whichever order
+ * they run in, and lowering it changes nothing observable while that holds. It
+ * becomes load-bearing the moment the shed stops being deferred — a pass that
+ * frees the CST synchronously has to run after every reader of it.
  */
 export const CST_RESIDENCY_PASS_PRIORITY = 1_000_000;
 
@@ -181,8 +185,10 @@ function rehydrateCst(document: LangiumDocument, factory: LangiumDocumentFactory
 }
 
 /**
- * Residency policy that reclaims memory by shedding the concrete syntax tree
- * (CST) of closed documents while keeping their AST resident. Each build refreshes
+ * Keeps a document's CST available to the readers that need one, shedding it
+ * for documents that have gone idle and re-grafting on demand.
+ *
+ * Each build refreshes
  * the idle window of the documents in its batch; when a closed, sheddable
  * document's window elapses, every AST node's `$cstNode` and every reference's
  * `$refNode` are nulled, and the CST root, `Range`s and `Position`s become
@@ -225,9 +231,25 @@ function rehydrateCst(document: LangiumDocument, factory: LangiumDocumentFactory
  * demand by the identity-preserving graft of {@link rehydrateNode} /
  * {@link rehydrate}, driven transparently from the framework
  * `NameProvider.getNameNode` chokepoint, the comment provider, and
- * `AbstractHydraniumLangiumDocuments.getOrCreateDocument`.
+ * `HydraniumLangiumDocuments.getOrCreateDocument`.
  */
-export class CstResidencyService {
+export interface CstResidencyService {
+   /**
+    * Ensure `document` has a CST, re-parsing its retained text if it was shed.
+    * A resident document is left exactly as it is, so this is safe to call on
+    * a hot path and safe to call twice.
+    */
+   rehydrate(document: LangiumDocument): void;
+
+   /**
+    * Node-level convenience over {@link rehydrate}, cheap enough for an
+    * unconditional call: a node whose `$cstNode` is already set returns
+    * without resolving its document.
+    */
+   rehydrateNode(node: AstNode): void;
+}
+
+export class DefaultCstResidencyService implements CstResidencyService {
    protected readonly strategy: CstResidencyStrategy;
    /** Bytes-per-node for the optional reclaim estimate in traces; `0` disables it. */
    protected readonly estimatedBytesPerShedNode: number;
@@ -277,8 +299,8 @@ export class CstResidencyService {
     * until navigation latency on shed files is actually observed to hurt. This
     * method is where that hook goes.
     */
-   rehydrate(document: LangiumDocument): boolean {
-      return rehydrateCst(document, this.services.workspace.LangiumDocumentFactory);
+   rehydrate(document: LangiumDocument): void {
+      rehydrateCst(document, this.services.workspace.LangiumDocumentFactory);
    }
 
    /**
@@ -287,11 +309,11 @@ export class CstResidencyService {
     * `true` without even resolving the document, so hot read paths
     * (`getNameNode`, comment lookup) call this unconditionally.
     */
-   rehydrateNode(node: AstNode): boolean {
+   rehydrateNode(node: AstNode): void {
       if (node.$cstNode !== undefined) {
-         return true;
+         return;
       }
-      return this.rehydrate(AstUtils.getDocument(node));
+      this.rehydrate(AstUtils.getDocument(node));
    }
 
    /**
@@ -353,8 +375,8 @@ export class CstResidencyService {
       this.shedTotal += this.shed(document);
    }
 
-   /** Cancel and drop every idle timer — for clean shutdown and deterministic tests. */
-   dispose(): void {
+   /** Cancel every armed shed, so a document that has gone idle keeps its CST. */
+   cancelPendingShed(): void {
       for (const timer of this.idleTimers.values()) {
          timer.dispose();
       }