@hydranium/protocol 1.0.0-next.35 → 1.0.0-next.350

package/lib/testing/node/index.d.ts

@@ -8,4 +8,5 @@
  ********************************************************************************/
 export * from './duplex-connection';
 export * from './duplex-stream';
+export * from './message-port-pair';
 //# sourceMappingURL=index.d.ts.map

package/lib/testing/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/node/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAalF,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/node/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAYlF,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}

package/lib/testing/node/index.js

@@ -23,8 +23,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // Subpath barrel for `@hydranium/protocol/testing/node` — the test transports
-// that need a Node runtime: a crossed `PassThrough` pair and the in-process
-// `MessageConnection` bridge over it.
+// that need a Node runtime.
 //
 // Separate from `./testing` because a `PassThrough` is in `DuplexStreamPair`'s
 // exported type and `StreamMessageReader` comes from `vscode-jsonrpc/node`, so
@@ -34,4 +33,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // their own.
 __exportStar(require("./duplex-connection"), exports);
 __exportStar(require("./duplex-stream"), exports);
+__exportStar(require("./message-port-pair"), exports);
 //# sourceMappingURL=index.js.map

package/lib/testing/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/node/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,8EAA8E;AAC9E,4EAA4E;AAC5E,sCAAsC;AACtC,EAAE;AACF,+EAA+E;AAC/E,+EAA+E;AAC/E,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,aAAa;AAEb,sDAAoC;AACpC,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/node/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,8EAA8E;AAC9E,4BAA4B;AAC5B,EAAE;AACF,+EAA+E;AAC/E,+EAA+E;AAC/E,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,aAAa;AAEb,sDAAoC;AACpC,kDAAgC;AAChC,sDAAoC"}

package/lib/testing/node/message-port-pair.d.ts

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+import type { TransferredMessagePort } from '../../client/post-message-transport';
+/**
+ * The two ends of a `worker_threads` `MessageChannel`, typed as the transferred
+ * browser ports `createMessagePortTransport` takes. Node's port clones and keeps
+ * order as a browser's does, which is what lets a headless test stand in for a
+ * worker.
+ *
+ * `dispose` closes both ports. Node reports that as a close and a browser port
+ * reports nothing, so a test that asserts on a close does so before teardown.
+ */
+export interface MessagePortPair {
+    readonly port1: TransferredMessagePort;
+    readonly port2: TransferredMessagePort;
+    dispose(): void;
+}
+export declare function makeMessagePortPair(): MessagePortPair;
+//# sourceMappingURL=message-port-pair.d.ts.map

package/lib/testing/node/message-port-pair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-port-pair.d.ts","sourceRoot":"","sources":["../../../src/testing/node/message-port-pair.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAElF;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC7B,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IACvC,OAAO,IAAI,IAAI,CAAC;CAClB;AAED,wBAAgB,mBAAmB,IAAI,eAAe,CAYrD"}

package/lib/testing/node/message-port-pair.js

@@ -0,0 +1,26 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeMessagePortPair = makeMessagePortPair;
+const node_worker_threads_1 = require("node:worker_threads");
+function makeMessagePortPair() {
+    const channel = new node_worker_threads_1.MessageChannel();
+    return {
+        // Node's port satisfies the structural type at runtime; the cast records
+        // one platform's port standing in for the other's.
+        port1: channel.port1,
+        port2: channel.port2,
+        dispose() {
+            channel.port1.close();
+            channel.port2.close();
+        }
+    };
+}
+//# sourceMappingURL=message-port-pair.js.map

package/lib/testing/node/message-port-pair.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-port-pair.js","sourceRoot":"","sources":["../../../src/testing/node/message-port-pair.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,6DAAqD;AAkBrD;IACG,MAAM,OAAO,GAAG,IAAI,oCAAc,EAAE,CAAC;IACrC,OAAO;QACJ,yEAAyE;QACzE,mDAAmD;QACnD,KAAK,EAAE,OAAO,CAAC,KAA0C;QACzD,KAAK,EAAE,OAAO,CAAC,KAA0C;QACzD,OAAO;YACJ,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;KACH,CAAC;AACL,CAAC"}

package/lib/testing/transfer-node-builder.d.ts

@@ -0,0 +1,81 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+import type { TransferElement } from '../transfer-element';
+import type { ConcreteTypeName, SingleTypeName } from '../types';
+/**
+ * The per-type constant the generated transfer model emits under each type's
+ * name, as Langium does for the AST. Its `$type` literal picks the interface
+ * out of the builder's type map.
+ */
+export interface TransferTypeConstant<TType extends string = string> {
+    readonly $type: TType;
+}
+/**
+ * What {@link makeTransferNodeBuilder} reads from a reflection: each type's
+ * grammar properties and their defaults. The generated
+ * `<LanguageId>TransferReflection` satisfies it without importing it, and
+ * keeps the literal type of its `types` so the builder can tell which fields
+ * the grammar defaults.
+ */
+export interface TransferReflection {
+    getTypeMetaData(type: string): {
+        readonly properties: Readonly<Record<string, {
+            readonly defaultValue?: unknown;
+        }>>;
+    };
+}
+/** The properties of `TType` that `TReflection`'s literal `types` gives a `defaultValue`; none for a reflection typed only as the interface. */
+type DefaultedKeys<TReflection, TType> = TReflection extends {
+    readonly types: infer Types;
+} ? TType extends keyof Types ? Types[TType] extends {
+    readonly properties: infer Properties;
+} ? {
+    [K in keyof Properties]: Properties[K] extends {
+        readonly defaultValue: unknown;
+    } ? K : never;
+}[keyof Properties] : never : never : never;
+/**
+ * Init payload of a {@link TransferNodeBuilder}: every field of `T` as its
+ * interface declares it, except that the fields named by `TDefaulted`, which
+ * the grammar defaults, are optional. `$type` comes from the constant.
+ */
+export type TransferNodeInit<T extends TransferElement, TDefaulted extends PropertyKey = never> = Omit<T, '$type' | TDefaulted> & Partial<Pick<T, Extract<TDefaulted, keyof T>>>;
+/**
+ * Transfer-node factory bound to a grammar's type map, the transfer twin of
+ * core's `AstNodeBuilder`. `TMap` is the generated `<LanguageId>TransferTypes`,
+ * `TReflection` the type of the generated reflection.
+ */
+export interface TransferNodeBuilder<TMap, TReflection extends TransferReflection = TransferReflection> {
+    /** A complete node: the grammar's defaults, then `init`. */
+    <TType extends ConcreteTypeName<TMap>>(typeConstant: TransferTypeConstant<TType> & SingleTypeName<TType>, init: TransferNodeInit<Extract<TMap[TType], TransferElement>, DefaultedKeys<TReflection, TType>>): Extract<TMap[TType], TransferElement>;
+    /**
+     * A node holding only `init`, with no defaults filled, typed as the
+     * incomplete node it is.
+     */
+    partial<TType extends ConcreteTypeName<TMap>>(typeConstant: TransferTypeConstant<TType> & SingleTypeName<TType>, init?: Partial<Omit<Extract<TMap[TType], TransferElement>, '$type'>>): Partial<Extract<TMap[TType], TransferElement>> & TransferTypeConstant<TType>;
+}
+/**
+ * Bind a {@link TransferNodeBuilder} to a grammar's reflection, so a test names
+ * only the fields it cares about and a containment field the grammar gains
+ * later needs no change at the call site.
+ *
+ * Defaults come from the reflection's grammar metadata alone, so a derived
+ * field the overlay adds is never defaulted, and stays required. An array
+ * default is a fresh `[]` per node. An init field named as `undefined` keeps
+ * its default, since the init type cannot refuse `undefined` for an optional
+ * field and a plain assign would leave the node typed complete without it.
+ *
+ * The constant's `$type` is written after `init`, because the init type keeps
+ * out only a `$type` written in the call: a spread of another node passes the
+ * check and would otherwise hand back a node typed as one type and tagged as
+ * another.
+ */
+export declare function makeTransferNodeBuilder<TMap, TReflection extends TransferReflection = TransferReflection>(reflection: TReflection): TransferNodeBuilder<TMap, TReflection>;
+export {};
+//# sourceMappingURL=transfer-node-builder.d.ts.map

package/lib/testing/transfer-node-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transfer-node-builder.d.ts","sourceRoot":"","sources":["../../src/testing/transfer-node-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEjE;;;;GAIG;AACH,MAAM,WAAW,oBAAoB,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAChE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IAChC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG;QAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC,CAAA;KAAE,CAAC;CACxH;AAED,gJAAgJ;AAChJ,KAAK,aAAa,CAAC,WAAW,EAAE,KAAK,IAAI,WAAW,SAAS;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,KAAK,CAAA;CAAE,GACvF,KAAK,SAAS,MAAM,KAAK,GACtB,KAAK,CAAC,KAAK,CAAC,SAAS;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,UAAU,CAAA;CAAE,GAC3D;KAAG,CAAC,IAAI,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;KAAE,GAAG,CAAC,GAAG,KAAK;CAAE,CAAC,MAAM,UAAU,CAAC,GACnH,KAAK,GACR,KAAK,GACR,KAAK,CAAC;AAEX;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,eAAe,EAAE,UAAU,SAAS,WAAW,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,GAC5H,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAElD;;;;GAIG;AACH,MAAM,WAAW,mBAAmB,CAAC,IAAI,EAAE,WAAW,SAAS,kBAAkB,GAAG,kBAAkB;IACnG,4DAA4D;IAC5D,CAAC,KAAK,SAAS,gBAAgB,CAAC,IAAI,CAAC,EAClC,YAAY,EAAE,oBAAoB,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,EACjE,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,EAAE,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,GAChG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,KAAK,SAAS,gBAAgB,CAAC,IAAI,CAAC,EACzC,YAAY,EAAE,oBAAoB,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,EACjE,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC,GACpE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;CAClF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,WAAW,SAAS,kBAAkB,GAAG,kBAAkB,EACtG,UAAU,EAAE,WAAW,GACvB,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAkBxC"}

package/lib/testing/transfer-node-builder.js

@@ -0,0 +1,47 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTransferNodeBuilder = makeTransferNodeBuilder;
+/**
+ * Bind a {@link TransferNodeBuilder} to a grammar's reflection, so a test names
+ * only the fields it cares about and a containment field the grammar gains
+ * later needs no change at the call site.
+ *
+ * Defaults come from the reflection's grammar metadata alone, so a derived
+ * field the overlay adds is never defaulted, and stays required. An array
+ * default is a fresh `[]` per node. An init field named as `undefined` keeps
+ * its default, since the init type cannot refuse `undefined` for an optional
+ * field and a plain assign would leave the node typed complete without it.
+ *
+ * The constant's `$type` is written after `init`, because the init type keeps
+ * out only a `$type` written in the call: a spread of another node passes the
+ * check and would otherwise hand back a node typed as one type and tagged as
+ * another.
+ */
+function makeTransferNodeBuilder(reflection) {
+    const build = (typeConstant, init) => {
+        const node = { $type: typeConstant.$type };
+        for (const [name, property] of Object.entries(reflection.getTypeMetaData(typeConstant.$type).properties)) {
+            if (property.defaultValue !== undefined) {
+                node[name] = Array.isArray(property.defaultValue) ? [...property.defaultValue] : property.defaultValue;
+            }
+        }
+        for (const [name, value] of Object.entries(init)) {
+            if (value !== undefined || !Object.hasOwn(node, name)) {
+                node[name] = value;
+            }
+        }
+        node.$type = typeConstant.$type;
+        return node;
+    };
+    const partial = (typeConstant, init = {}) => ({ ...init, $type: typeConstant.$type });
+    return Object.assign(build, { partial });
+}
+//# sourceMappingURL=transfer-node-builder.js.map

package/lib/testing/transfer-node-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transfer-node-builder.js","sourceRoot":"","sources":["../../src/testing/transfer-node-builder.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AA+DlF;;;;;;;;;;;;;;;GAeG;AACH,iCACG,UAAuB;IAEvB,MAAM,KAAK,GAAG,CAAC,YAAkC,EAAE,IAAY,EAAU,EAAE;QACxE,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC;QACpE,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;YACxG,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1G,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YACtB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;QAChC,OAAO,IAAI,CAAC;IACf,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,CAAC,YAAkC,EAAE,IAAI,GAAW,EAAE,EAAU,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5H,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAA2C,CAAC;AACtF,CAAC"}

package/lib/testing/wait-for.d.ts

@@ -31,12 +31,18 @@ export interface WaitForOptions {
     readonly timeoutMs?: number;
     /** Poll the predicate every this-many milliseconds. Default 5. */
     readonly intervalMs?: number;
-    /** Error message on timeout. Default a generic phrasing. */
-    readonly message?: string;
+    /**
+     * Error message on timeout, and when the predicate throws. A function is
+     * called only then, so it can report the state the wait ended on; when it
+     * throws, the default text is used, with its throw as the error's `cause`
+     * unless the predicate threw. Default a generic phrasing.
+     */
+    readonly message?: string | (() => string);
 }
 /**
  * Resolve once `predicate()` returns true, polling at `intervalMs`; reject with
- * `message` once `timeoutMs` elapses. The **non-racy** alternative to a fixed
+ * `message` once `timeoutMs` elapses, or at once when the predicate throws, with
+ * the throw as the error's `cause`. The **non-racy** alternative to a fixed
  * sleep for awaiting an asynchronous side effect that lands on an observable
  * value.
  *

package/lib/testing/wait-for.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait-for.d.ts","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,mCAAmC;AACnC,MAAM,WAAW,cAAc;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,4DAA4D;IAC5D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,OAAO,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,IAAI,CAAC,EAAE,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C"}
+{"version":3,"file":"wait-for.d.ts","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,mCAAmC;AACnC,MAAM,WAAW,cAAc;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;CAC7C;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,OAAO,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8D7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,IAAI,CAAC,EAAE,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C"}

package/lib/testing/wait-for.js

@@ -12,7 +12,8 @@ exports.waitFor = waitFor;
 exports.tick = tick;
 /**
  * Resolve once `predicate()` returns true, polling at `intervalMs`; reject with
- * `message` once `timeoutMs` elapses. The **non-racy** alternative to a fixed
+ * `message` once `timeoutMs` elapses, or at once when the predicate throws, with
+ * the throw as the error's `cause`. The **non-racy** alternative to a fixed
  * sleep for awaiting an asynchronous side effect that lands on an observable
  * value.
  *
@@ -29,20 +30,65 @@ exports.tick = tick;
 function waitFor(predicate, options = {}) {
     const timeoutMs = options.timeoutMs ?? 2000;
     const intervalMs = options.intervalMs ?? 5;
-    const message = options.message ?? `Timed out after ${timeoutMs}ms waiting for a condition`;
-    if (predicate()) {
-        return Promise.resolve();
-    }
+    const defaultMessage = `Timed out after ${timeoutMs}ms waiting for a condition`;
     return new Promise((resolve, reject) => {
-        const deadline = setTimeout(() => {
+        // A throw from the predicate or the message function would leave the
+        // promise unsettled from the poll's or the deadline's timer, or escape
+        // `waitFor` itself on the first check; it rejects instead, with the
+        // predicate's throw, else the message function's, as cause. True once
+        // the promise is settled.
+        const settle = (timedOut) => {
+            let met = false;
+            let threw = false;
+            let cause;
+            try {
+                met = predicate();
+            }
+            catch (error) {
+                threw = true;
+                cause = error;
+            }
+            if (met) {
+                resolve();
+                return true;
+            }
+            if (!timedOut && !threw) {
+                return false;
+            }
+            let message = defaultMessage;
+            try {
+                if (typeof options.message === 'function') {
+                    message = options.message();
+                }
+                else if (options.message !== undefined) {
+                    message = options.message;
+                }
+            }
+            catch (error) {
+                if (!threw) {
+                    threw = true;
+                    cause = error;
+                }
+            }
+            reject(new Error(message, threw ? { cause } : undefined));
+            return true;
+        };
+        if (settle(false)) {
+            return;
+        }
+        const stop = () => {
             clearInterval(poll);
-            reject(new Error(message));
+            clearTimeout(deadline);
+        };
+        // A stalled loop can run the deadline after the condition came true but
+        // before the next poll saw it, so the deadline checks once more.
+        const deadline = setTimeout(() => {
+            settle(true);
+            stop();
         }, timeoutMs);
         const poll = setInterval(() => {
-            if (predicate()) {
-                clearInterval(poll);
-                clearTimeout(deadline);
-                resolve();
+            if (settle(false)) {
+                stop();
             }
         }, intervalMs);
     });

package/lib/testing/wait-for.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait-for.js","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;AAgDlF,0BAoBC;AAgBD,oBAEC;AAtDD;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,OAAO,CAAC,SAAwB,EAAE,UAA0B,EAAE;IAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,mBAAmB,SAAS,4BAA4B,CAAC;IAC5F,IAAI,SAAS,EAAE,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9B,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3B,IAAI,SAAS,EAAE,EAAE,CAAC;gBACf,aAAa,CAAC,IAAI,CAAC,CAAC;gBACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvB,OAAO,EAAE,CAAC;YACb,CAAC;QACJ,CAAC,EAAE,UAAU,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,IAAI,CAAC,EAAE,GAAG,EAAE;IACzB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"wait-for.js","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;AAqClF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAwB,SAAwB,EAAE,OAAO,GAAmB,EAAE;IAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;IAC3C,MAAM,cAAc,GAAG,mBAAmB,SAAS,4BAA4B,CAAC;IAChF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,qEAAqE;QACrE,uEAAuE;QACvE,oEAAoE;QACpE,sEAAsE;QACtE,0BAA0B;QAC1B,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAW,EAAE;YAC3C,IAAI,GAAG,GAAG,KAAK,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBACF,GAAG,GAAG,SAAS,EAAE,CAAC;YACrB,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACvB,KAAK,GAAG,IAAI,CAAC;gBACb,KAAK,GAAG,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,GAAG,EAAE,CAAC;gBACP,OAAO,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACf,CAAC;YACD,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC;YAChB,CAAC;YACD,IAAI,OAAO,GAAG,cAAc,CAAC;YAC7B,IAAI,CAAC;gBACF,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC/B,CAAC;qBAAM,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;oBACxC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC7B,CAAC;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACvB,IAAI,CAAC,KAAK,EAAE,CAAC;oBACV,KAAK,GAAG,IAAI,CAAC;oBACb,KAAK,GAAG,KAAK,CAAC;gBACjB,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QACf,CAAC,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO;QACV,CAAC;QACD,MAAM,IAAI,GAAG,GAAS,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC,CAAC;QACF,wEAAwE;QACxE,iEAAiE;QACjE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC;YACb,IAAI,EAAE,CAAC;QACV,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjB,IAAI,EAAE,CAAC;YACV,CAAC;QACJ,CAAC,EAAE,UAAU,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,cAAqB,EAAE,GAAG,EAAE;IACzB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC"}

package/lib/tracer.d.ts.map

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

package/lib/tracer.js

@@ -14,6 +14,7 @@ const logger_1 = require("./logger");
 const noop_logger_1 = require("./noop-logger");
 const profile_session_1 = require("./profile-session");
 const util_1 = require("./util");
+const primitives_1 = require("./messages/primitives");
 /** Module-global so nested timers don't reuse ids. */
 let nextTimerId = 0;
 /** Ops completing before this threshold are silent on success — only failures emit a retroactive start. */
@@ -114,15 +115,10 @@ class DefaultTracer {
             const suffix = this.timingSuffix(status, elapsed, options);
             this.logger[logLevel](`${label} [#${id} ${status}, ${logger_1.Format.elapsed(elapsed)}${currentExtras()}${suffix}]`);
             if (status === 'failed') {
-                // The timing line above sits at `logLevel`, which may be below the
-                // active threshold — and on its own it never carries *why* the op
-                // failed. Surface the error at warn so the failure is never silent,
-                // with the stack at debug. Cancellations are normal control flow.
-                const detail = error instanceof Error ? error.message : String(error);
-                this.logger.warn(`${label} [#${id}] failed: ${detail}`);
-                if (error instanceof Error && error.stack) {
-                    this.logger.debug(error.stack);
-                }
+                // Reporting the failure is the caller's, who receives it: a line at
+                // warn here would exist only while `logLevel` is enabled.
+                const detail = (0, primitives_1.describeErrorWithStack)(error);
+                this.logger.debug(`${label} [#${id}] failed: ${detail}`);
             }
         };
         let result;

package/lib/tracer.js.map

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

package/lib/transfer-diagnostic.js.map

@@ -1 +1 @@
-{"version":3,"file":"transfer-diagnostic.js","sourceRoot":"","sources":["../src/transfer-diagnostic.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAsElF,IAAiB,kBAAkB,CAsDlC;AAtDD,WAAiB,kBAAkB;IAChC,mEAAmE;IACtD,4CAAyB,GAAG,GAAG,CAAC;IAC7C,wDAAwD;IAC3C,0CAAuB,GAAG,GAAG,CAAC;IAC3C,sFAAsF;IACzE,6CAA0B,GAAG,GAAG,CAAC;IAE9C,SAAgB,OAAO,CAAC,UAA8B;QACnD,OAAO,UAAU,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC1C,CAAC;IAFe,0BAAO,UAEtB,CAAA;IAED,SAAgB,YAAY,CAAC,UAA8B;QACxD,OAAO,UAAU,CAAC,IAAI,KAAK,eAAe,CAAC;IAC9C,CAAC;IAFe,+BAAY,eAE3B,CAAA;IAED;;;;;;;;;;;;;;;OAeG;IACH,SAAgB,QAAQ,CAAC,UAA8B;QACpD,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1E,OAAO,SAAS,CAAC;QACpB,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;IACzF,CAAC;IALe,2BAAQ,WAKvB,CAAA;IAED,SAAgB,OAAO,CAAC,UAA8B;QACnD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,GAAG,mBAAA,0BAA0B,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;IAChI,CAAC;IAFe,0BAAO,UAEtB,CAAA;IAED,SAAgB,MAAM,CAAC,WAAiC;QACrD,OAAO,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAFe,yBAAM,SAErB,CAAA;IAED,SAAgB,SAAS,CAAC,WAAiC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAFe,4BAAS,YAExB,CAAA;IAED,SAAgB,cAAc,CAAC,WAAiC;QAC7D,OAAO,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAFe,iCAAc,iBAE7B,CAAA;AACJ,CAAC,EAtDgB,kBAAkB,kCAAlB,kBAAkB,QAsDlC"}
+{"version":3,"file":"transfer-diagnostic.js","sourceRoot":"","sources":["../src/transfer-diagnostic.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAsElF,IAAiB,kBAAkB,CAsDlC;AAtDD,WAAiB,kBAAkB;IAChC,mEAAmE;IACtD,4CAAyB,GAAG,GAAG,CAAC;IAC7C,wDAAwD;IAC3C,0CAAuB,GAAG,GAAG,CAAC;IAC3C,sFAAsF;IACzE,6CAA0B,GAAG,GAAG,CAAC;IAE9C,SAAgB,OAAO,CAAC,UAA8B;QACnD,OAAO,UAAU,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC1C,CAAC;IAFe,mBAAA,OAAO,UAEtB,CAAA;IAED,SAAgB,YAAY,CAAC,UAA8B;QACxD,OAAO,UAAU,CAAC,IAAI,KAAK,eAAe,CAAC;IAC9C,CAAC;IAFe,mBAAA,YAAY,eAE3B,CAAA;IAED;;;;;;;;;;;;;;;OAeG;IACH,SAAgB,QAAQ,CAAC,UAA8B;QACpD,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1E,OAAO,SAAS,CAAC;QACpB,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;IACzF,CAAC;IALe,mBAAA,QAAQ,WAKvB,CAAA;IAED,SAAgB,OAAO,CAAC,UAA8B;QACnD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,GAAG,6CAA0B,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;IAChI,CAAC;IAFe,mBAAA,OAAO,UAEtB,CAAA;IAED,SAAgB,MAAM,CAAC,WAAiC;QACrD,OAAO,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAFe,mBAAA,MAAM,SAErB,CAAA;IAED,SAAgB,SAAS,CAAC,WAAiC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAFe,mBAAA,SAAS,YAExB,CAAA;IAED,SAAgB,cAAc,CAAC,WAAiC;QAC7D,OAAO,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAFe,mBAAA,cAAc,iBAE7B,CAAA;AACJ,CAAC,EAtDgB,kBAAkB,aAAlB,kBAAkB,GAAlB,kBAAkB,QAsDlC"}

package/lib/transfer-document.d.ts

@@ -8,47 +8,110 @@
  ********************************************************************************/
 import type { TransferDiagnostic } from './transfer-diagnostic';
 import type { TransferElement } from './transfer-element';
+import { type ModelVersion, type TextVersion } from './model-service/base-version';
+/** The model a data server built for a document, encoded for the wire. */
+export interface TransferModelSnapshot<TRoot extends TransferElement, TDiagnostic = TransferDiagnostic> {
+    root: TRoot;
+    /** Absent until the document is validated; `[]` once it is and nothing was found. */
+    diagnostics?: TDiagnostic[];
+    /**
+     * The version of the text `root` was parsed from. A caller that mutates the
+     * model sends this back as the `baseVersion` of its write, and the server
+     * rejects the write with `ConflictError` once its text has moved past it.
+     */
+    version: ModelVersion;
+    /**
+     * The data server's fingerprint of `root` and `diagnostics`, or under its
+     * `'text-diagnostics'` strategy of the text `root` was parsed from and
+     * `diagnostics`.
+     * Independent of `version`; an equal hash also means equally validated.
+     */
+    hash: string;
+}
+/** The text a data server held for a document when it sent it. */
+export interface TextState {
+    /**
+     * The server's version of that text. A `TransferModelSnapshot.version` below it
+     * means the model was parsed from older text, and an update at this version
+     * or a later one follows.
+     */
+    version: TextVersion;
+    /**
+     * What `textHash` makes of the text alone: equal texts hash equal whatever
+     * their version or dirty state, across a revert or a server restart that
+     * numbers versions afresh.
+     */
+    hash: string;
+    /**
+     * Whether the text differs from the file, as the server last knew the file.
+     * A later change arrives as `onDocumentDirtyChanged` to a client watching
+     * the document.
+     */
+    dirty: boolean;
+}
 /**
  * Wire envelope exchanged between the model-server's data-server head and
- * its clients. Carries a transfer-shaped root — never an AST root — plus
- * the document's diagnostics in the adopter's wire-diagnostic shape.
+ * its clients: the server's model of a document and the text it holds for it,
+ * each absent where the server has none.
  *
  * The constraint `TTransfer extends TransferElement` pins the type system
  * to the wire data shape (no `$container` cycles, references as strings;
- * see {@link TransferElement}). The paired server-internal envelope is
- * `AstDocument<TAst extends AstNode, TDiagnostic>` in
- * `@hydranium/core` — same structural shape, different generic
- * constraint, used at the AST layer before the `TransferEncoder`
- * translation produces a {@link TransferDocument}.
+ * see {@link TransferElement}).
  */
 export interface TransferDocument<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic> {
     uri: string;
     /**
-     * The document version this snapshot was taken at — sourced from the
-     * server's text-document version counter. Callers that mutate the
-     * document subsequently pass this value back as `TransferUpdateArgs.baseVersion`
-     * (or `TransferSaveArgs.baseVersion`) so the server can detect stale-based
-     * updates and reject them with `ConflictError`.
-     *
-     * See `@hydranium/protocol#errors` for the conflict-detection contract.
-     */
-    version: number;
-    /**
-     * Absent when the document does not exist — the server answers an unknown URI
-     * with a shaped envelope rather than an error, so absence is an ordinary
-     * branch and not a catch. Declared required it reads as a guarantee, and
-     * every `root.x` compiles into a throw.
+     * Absent when the document does not exist: the server answers an unknown
+     * URI with a shaped envelope rather than an error, so absence is an
+     * ordinary branch and not a catch.
      */
-    root?: TTransfer;
-    diagnostics: TDiagnostic[];
+    model?: TransferModelSnapshot<TTransfer, TDiagnostic>;
+    /** Absent when the server holds no text for the document. */
+    text?: TextState;
 }
 /**
- * A {@link TransferDocument} the server actually had, so `root` is present.
+ * A {@link TransferDocument} the server actually had, so `model` is present.
  * Narrowed to by {@link TransferDocument.isLoaded} / {@link TransferDocument.assertLoaded}.
  */
 export type LoadedTransferDocument<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic> = TransferDocument<TTransfer, TDiagnostic> & {
-    root: TTransfer;
+    model: TransferModelSnapshot<TTransfer, TDiagnostic>;
+};
+/**
+ * What a save or a persist answers: the document, and in `persisted` the
+ * version of the text it wrote to the file. That can differ from
+ * `model.version` either way, since writes land between the build and the
+ * take, so a client marking a version saved takes it from here.
+ */
+export type TransferSavedDocument<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic> = TransferDocument<TTransfer, TDiagnostic> & {
+    persisted: {
+        version: TextVersion;
+    };
 };
+/**
+ * What a create answers: the document as a read after the create finds it,
+ * and in `created` the version the create's text took. Another client's write
+ * or an integrity repair can land between the create and that read, so
+ * `model.version` can be past it, and a write based on it would carry that
+ * text as the creator's; a write based on `created.version` conflicts instead.
+ * A model version, not a text version, because the creator holds the text at
+ * that version: it sent it.
+ */
+export type TransferCreatedDocument<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic> = TransferDocument<TTransfer, TDiagnostic> & {
+    created: {
+        version: ModelVersion;
+    };
+};
+/** What a watch answers, once it is in place. */
+export interface TransferWatchedDocument {
+    /** The key the watch's events name the document by, which a symlinked URI does not spell. */
+    readonly uri: string;
+    /** Whether a document exists there; one the server fails to load counts, only a missing one does not. */
+    readonly exists: boolean;
+    /** The position of the last update or deletion event sent before `exists` was taken; an event past it was sent after. */
+    readonly sequence: number;
+    /** The text the server held when `exists` was taken, as a read answers it; absent when it held none. */
+    readonly text?: TextState;
+}
 export declare namespace TransferDocument {
     /**
      * Whether the server had this document. Branch on it where absence is an
@@ -56,18 +119,18 @@ export declare namespace TransferDocument {
      */
     function isLoaded<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic>(document: TransferDocument<TTransfer, TDiagnostic>): document is LoadedTransferDocument<TTransfer, TDiagnostic>;
     /**
-     * The same document with `root` no longer optional, or a throw. For call
+     * The same document with `model` no longer optional, or a throw. For call
      * sites where absence is a bug rather than a branch; the whole envelope is
-     * returned because a caller needing `root` usually needs `uri` or `version`
+     * returned because a caller needing `model` usually needs `uri` or `text`
      * with it.
      */
     function assertLoaded<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic>(document: TransferDocument<TTransfer, TDiagnostic>): LoadedTransferDocument<TTransfer, TDiagnostic>;
+    /** The envelope for a document the server does not have. */
+    function absent<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic>(uri: string): TransferDocument<TTransfer, TDiagnostic>;
     /**
-     * Construct a {@link TransferDocument} envelope. `diagnostics` defaults
-     * to `[]` so test fixtures, fake protocol implementations, and the
-     * "no diagnostics yet" code paths don't need to repeat the empty array
-     * at every call site.
+     * Construct a {@link TransferDocument} envelope with a model, its version
+     * marked as coming from a read. `diagnostics` absent means not validated.
      */
-    function create<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic>(uri: string, version: number, root: TTransfer, diagnostics?: TDiagnostic[]): TransferDocument<TTransfer, TDiagnostic>;
+    function create<TTransfer extends TransferElement, TDiagnostic = TransferDiagnostic>(uri: string, version: number, root: TTransfer, hash: string, diagnostics?: TDiagnostic[], text?: TextState): TransferDocument<TTransfer, TDiagnostic>;
 }
 //# sourceMappingURL=transfer-document.d.ts.map