@owlmeans/error 0.1.18-rc.26 → 0.1.18-rc.28

package/README.md

@@ -12,7 +12,7 @@ framework packages already ship: authentication and authorization failures from
 ## Installation
 
 ```bash
-bun add @owlmeans/error@^0.1.18-rc.26
+bun add @owlmeans/error@^0.1.18-rc.28
 ```
 
 ## Concepts
@@ -201,7 +201,8 @@ Panel components resolve an error through `errors.<type>` — a form- or screen-
 | `ResilientError` | class | Base class of every framework error; `constructor(type, message, stack?)` |
 | `ResilientError.typeName` | static property | Type identifier; override in each subclass (`'ResilientError'` on the base) |
 | `ResilientError.separator` | static property | Marshalling separator, initialised from `SEPARATOR` |
-| `ResilientError.converters` | static property | The registry of `Converter` entries |
+| `ResilientError.converters` | static property | The registry of `Converter` entries — one array on `globalThis`, shared by every copy of the package in the process |
+| `ResilientError[Symbol.hasInstance]` | static method | `instanceof` that also matches an instance of the same class lineage built by another copy of the package |
 | `ResilientError.registerErrorClass(Class, errorClass?)` | static method | Registers a subclass so it survives a round trip; returns its `Converter` |
 | `ResilientError.ensure(err, throwOnUnknown?)` | static method | Turns an `Error` or string into a `ResilientError`, unmarshalling registered classes |
 | `ResilientError.marshal(err)` | static method | Flattens an error into a plain `Error` whose message is `type`, `message` and stack joined by `SEPARATOR` |
@@ -216,8 +217,10 @@ Panel components resolve an error through `errors.<type>` — a form- or screen-
 |--------|------|---------|
 | `enuserError<T>(err, throwOnUnknown?)` | function | `ResilientError.ensure`, typed to the subclass you expect |
 | `marshalError(err)` | function | `ensure` then `marshal`, for a boundary that only carries an `Error` or a string |
+| `isResilientError(value)` | function | Structural check (shared brand + `type` + `marshal`) that holds across duplicate module copies |
 | `SEPARATOR` | constant | Three pipe characters — joins the marshalled fields |
 | `RESILENT_ERROR` | constant | `'ResilientError'` — the base type name |
+| `RESILIENT_BRAND`, `CONVERTER_REGISTRY`, `CATCH_ALL_CONVERTER` | constant | `Symbol.for` keys every copy of the package shares |
 
 ### Types
 
@@ -269,7 +272,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills@^0.1.18-rc.27
+npx @owlmeans/agent-skills@^0.1.18-rc.30
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/error",
-  "version": "0.1.18-rc.26",
-  "generatedAt": "2026-09-15T14:03:05.104Z",
+  "version": "0.1.18-rc.28",
+  "generatedAt": "2026-09-19T13:42:56.272Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/error/SKILL.md

@@ -8,7 +8,7 @@ user-invocable: false
 # @owlmeans/error
 
 **Layer:** Core
-**Install:** `"@owlmeans/error": "^0.1.18-rc.26"` in `dependencies`
+**Install:** `"@owlmeans/error": "^0.1.18-rc.28"` in `dependencies`
 
 ## Key Exports
 
@@ -20,7 +20,9 @@ user-invocable: false
 | `ResilientError.marshal(err)` / `err.marshal()` | Flatten into a plain `Error` a transport can carry |
 | `enuserError(err)` | `ensure`, typed to the subclass you expect |
 | `marshalError(err)` | `ensure` then `marshal`, for a boundary that only sends `Error` |
+| `isResilientError(value)` | Structural check that holds across duplicate module copies |
 | `SEPARATOR` (`'\|\|\|'`), `RESILENT_ERROR` | The marshalling separator and the base type name |
+| `RESILIENT_BRAND`, `CONVERTER_REGISTRY`, `CATCH_ALL_CONVERTER` | The `Symbol.for` keys every copy shares |
 | `Converter` | `{ match, convert, isMarshaled, unmarshal }` — one registry entry |
 | `ResilientErrorConstructor` | The constructor shape `registerErrorClass` accepts |
 | `ValueOrError<T>` | `T \| ResilientError`, for a result that carries either |
@@ -61,6 +63,25 @@ throw new RateLimitError('per-minute')
 A subclass of a subclass calls `super` with the message alone and then re-stamps `this.type` — the
 parent supplies its own prefix, so the final message reads `api:rate-limit:per-minute`.
 
+**A refusal of the caller's condition declares its HTTP status** as `public static httpStatus = <4xx>`;
+a fault — a broken peer, a timeout, a missing configuration, a bug — declares nothing and answers 500.
+One principle picks the number:
+
+| Status | The caller's condition |
+|---|---|
+| 400 | the request is malformed |
+| 402 | the balance or plan does not pay for it |
+| 404 | the addressed target does not exist, or is another organization's |
+| 409 | the target's current state conflicts with the request |
+| 422 | the request is understood, and its content or body is refused |
+
+Declare it on the leaf class, never on a family base: a static is inherited, so a base's status
+would reach every fault that extends it. A class thrown for several causes takes the status of the
+cause a caller can reach, and one whose causes are told apart only by message declares nothing.
+Nothing here reads it — `@owlmeans/server-api` does, structurally, and answers 500 for any class
+without an integer 4xx declaration (see the `server-api` skill). A permission refusal extends
+`AuthForbidden` (403) instead of declaring.
+
 `registerErrorClass` takes a second, native-class argument, and `ensure` takes a second
 `throwOnUnknown` argument. **Neither has any effect** — a catch-all converter is pushed onto the
 registry when this package loads and it is the first entry `ensure` tests for conversion, so no
@@ -84,7 +105,7 @@ What `ensure` actually does, in order:
 
 | Input | Result |
 |-------|--------|
-| A `ResilientError` | returned untouched |
+| A `ResilientError` from any copy of this package | returned untouched |
 | A `SyntaxError` | rethrown — never converted |
 | An `Error` marshaled from a **registered** class | unmarshaled into that class, `type` and `message` restored |
 | Anything else | a bare `ResilientError` whose **`type` is the original `message`** and whose **`message` is the original stack** |
@@ -99,11 +120,32 @@ process is wired wrong (an unknown alias, a missing service, a route cycle), and
 rather than reach a user as a handled failure. Do not throw one for a runtime condition a caller is
 expected to handle.
 
+## Duplicate module copies behave as one
+
+A process can load this package more than once — `bun --preserve-symlinks` over linked workspaces
+keys a module by its unresolved path, so a package that keeps its own
+`node_modules/@owlmeans/error` link loads a second copy. Every copy acts as one:
+
+- **One registry.** `ResilientError.converters` is the array kept on `globalThis` under
+  `Symbol.for('@owlmeans/error:converters')`; every copy registers into it and unmarshals from it,
+  in registration order, so the **last registration of a type name wins** across copies. One
+  catch-all converter exists per process.
+- **One brand.** Every instance inherits `Symbol.for('@owlmeans/error:resilient')` from its copy's
+  prototype. `isResilientError(value)` is brand + string `type` + `marshal` function; `ensure`
+  returns such a value untouched and `marshal` keeps its `type`. A lookalike without the brand is
+  not a resilient error.
+- **`instanceof` across copies.** `ResilientError[Symbol.hasInstance]` answers natively first, then
+  structurally: the instance's lineage of OWN `typeName`s must end with the checked class's lineage.
+  A class from another copy matches itself and its ancestors, never a sibling or a parent. A class
+  that does not declare its own `typeName` matches natively only — declare one on every subclass.
+
 ## Crossing a service boundary
 
-`marshal` flattens `type`, `message` and the original stack into one `Error` message joined by
-`SEPARATOR`. On the far side `ensure` recognises the prefix and rebuilds the registered class, so a
-typed error thrown in a backend is caught as the same class in a client. Override
+`marshal` flattens `type`, `message`, the selected stack exposure and an optional incident id into
+one `Error` message joined by `SEPARATOR`. On the far side `ensure` recognises the prefix and rebuilds
+the registered class, so a typed error thrown in a backend is caught as the same class in a client.
+The HTTP boundary attaches the incident id to the logged error and sends only that id in production;
+development callers may select the stack explicitly. Override
 `finalizeUnmarshal()` on a subclass that needs to rebuild state from its message after that.
 
 ## Messages are i18n keys

package/build/consts.d.ts

@@ -1,3 +1,16 @@
 export declare const SEPARATOR = "|||";
 export declare const RESILENT_ERROR = "ResilientError";
+/**
+ * Marks every `ResilientError` instance, whichever copy of this module built it.
+ *
+ * A process can hold several copies of this package (`bun --preserve-symlinks` over a linked
+ * workspace resolves one package through several `node_modules` paths), and `instanceof` answers
+ * for one copy only. `Symbol.for` returns the same symbol in every copy, so the brand is the
+ * structural proof `ensure`, `marshal` and `instanceof` read.
+ */
+export declare const RESILIENT_BRAND: unique symbol;
+/** The `globalThis` key of the converter registry every copy of this module shares. */
+export declare const CONVERTER_REGISTRY: unique symbol;
+/** Marks the catch-all converter, so a second module copy does not push another one. */
+export declare const CATCH_ALL_CONVERTER: unique symbol;
 //# sourceMappingURL=consts.d.ts.map

package/build/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,SAAS,QAAQ,CAAA;AAE9B,eAAO,MAAM,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,SAAS,QAAQ,CAAA;AAE9B,eAAO,MAAM,cAAc,mBAAmB,CAAA;AAE9C;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE,OAAO,MAAgD,CAAA;AAErF,uFAAuF;AACvF,eAAO,MAAM,kBAAkB,EAAE,OAAO,MAAiD,CAAA;AAEzF,wFAAwF;AACxF,eAAO,MAAM,mBAAmB,EAAE,OAAO,MAAgD,CAAA"}

package/build/consts.js

@@ -1,3 +1,16 @@
 export const SEPARATOR = '|||';
 export const RESILENT_ERROR = 'ResilientError';
+/**
+ * Marks every `ResilientError` instance, whichever copy of this module built it.
+ *
+ * A process can hold several copies of this package (`bun --preserve-symlinks` over a linked
+ * workspace resolves one package through several `node_modules` paths), and `instanceof` answers
+ * for one copy only. `Symbol.for` returns the same symbol in every copy, so the brand is the
+ * structural proof `ensure`, `marshal` and `instanceof` read.
+ */
+export const RESILIENT_BRAND = Symbol.for('@owlmeans/error:resilient');
+/** The `globalThis` key of the converter registry every copy of this module shares. */
+export const CONVERTER_REGISTRY = Symbol.for('@owlmeans/error:converters');
+/** Marks the catch-all converter, so a second module copy does not push another one. */
+export const CATCH_ALL_CONVERTER = Symbol.for('@owlmeans/error:catch-all');
 //# sourceMappingURL=consts.js.map

package/build/consts.js.map

@@ -1 +1 @@
-{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAA;AAE9B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAA"}
+{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAA;AAE9B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAA;AAE9C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,eAAe,GAAkB,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;AAErF,uFAAuF;AACvF,MAAM,CAAC,MAAM,kBAAkB,GAAkB,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;AAEzF,wFAAwF;AACxF,MAAM,CAAC,MAAM,mBAAmB,GAAkB,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA"}

package/build/resilient.d.ts

@@ -1,15 +1,33 @@
-import type { Converter, ResilientErrorConstructor } from './types.js';
+import type { Converter, MarshalErrorOptions, ResilientErrorConstructor } from './types.js';
+/**
+ * Whether a value is a `ResilientError` built by ANY copy of this module.
+ *
+ * Structural: the shared brand plus the `type` and `marshal` every instance carries.
+ */
+export declare const isResilientError: (value: unknown) => value is ResilientError;
 export declare class ResilientError extends Error {
     static separator: string;
     static typeName: string;
     static converters: Converter[];
+    /**
+     * `instanceof` that holds across module copies.
+     *
+     * The native prototype check answers first. Failing that, a branded instance matches when its
+     * class lineage ENDS WITH this class's lineage — the same own type names, in the same order, up
+     * to the base. So `instanceof AuthFailedError` accepts an `AuthFailedError` (or a subclass of it)
+     * from another copy, and never a sibling class or a parent. A class that does not declare its
+     * own `typeName` cannot be told apart structurally and answers natively only.
+     */
+    static [Symbol.hasInstance]<T extends abstract new (...args: any[]) => any>(this: T, instance: unknown): instance is InstanceType<T>;
     static registerErrorClass(resilientErrorClass: ResilientErrorConstructor, errorClass?: ErrorConstructor): Converter;
     static ensure(err: Error | string, throwOnUnknown?: boolean): ResilientError;
-    static marshal(err: Error): Error;
+    static marshal(err: Error, opts?: MarshalErrorOptions): Error;
     type: string;
     oiriginalStack?: string;
+    /** Correlates a serialized boundary error with the server log entry that owns its full stack. */
+    incidentId?: string;
     constructor(type: string, message: string, stack?: string);
-    marshal(): Error;
+    marshal(opts?: MarshalErrorOptions): Error;
     finalizeUnmarshal(): void;
 }
 //# sourceMappingURL=resilient.d.ts.map

package/build/resilient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resilient.d.ts","sourceRoot":"","sources":["../src/resilient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAGtE,qBAAa,cAAe,SAAQ,KAAK;IACvC,OAAc,SAAS,EAAE,MAAM,CAAY;IAE3C,OAAc,QAAQ,EAAE,MAAM,CAAiB;IAE/C,OAAc,UAAU,EAAE,SAAS,EAAE,CAAK;IAE1C,OAAc,kBAAkB,CAAC,mBAAmB,EAAE,yBAAyB,EAAE,UAAU,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAKzH;IAED,OAAc,MAAM,CAAC,GAAG,EAAE,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,cAAc,CA4BlF;IAED,OAAc,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,CAMvC;IAEM,IAAI,EAAE,MAAM,CAAiB;IAE7B,cAAc,CAAC,EAAE,MAAM,CAAA;IAE9B,YAAY,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAQxD;IAED,OAAO,IAAI,KAAK,CAEf;IAED,iBAAiB,IAAI,IAAI,CAAI;CAC9B"}
+{"version":3,"file":"resilient.d.ts","sourceRoot":"","sources":["../src/resilient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAyC3F;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,UAAW,OAAO,KAAG,KAAK,IAAI,cAS1D,CAAA;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,OAAc,SAAS,EAAE,MAAM,CAAY;IAE3C,OAAc,QAAQ,EAAE,MAAM,CAAiB;IAE/C,OAAc,UAAU,EAAE,SAAS,EAAE,CAAqB;IAE1D;;;;;;;;OAQG;IACH,OAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EACxF,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,GACzB,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,CAY7B;IAED,OAAc,kBAAkB,CAAC,mBAAmB,EAAE,yBAAyB,EAAE,UAAU,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAKzH;IAED,OAAc,MAAM,CAAC,GAAG,EAAE,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,cAAc,CA4BlF;IAED,OAAc,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,KAAK,CAenE;IAEM,IAAI,EAAE,MAAM,CAAiB;IAE7B,cAAc,CAAC,EAAE,MAAM,CAAA;IAE9B,iGAAiG;IAC1F,UAAU,CAAC,EAAE,MAAM,CAAA;IAE1B,YAAY,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAQxD;IAED,OAAO,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,KAAK,CAEzC;IAED,iBAAiB,IAAI,IAAI,CAAI;CAC9B"}

package/build/resilient.js

@@ -1,9 +1,76 @@
-import { RESILENT_ERROR, SEPARATOR } from './consts.js';
+import { CATCH_ALL_CONVERTER, CONVERTER_REGISTRY, RESILENT_ERROR, RESILIENT_BRAND, SEPARATOR } from './consts.js';
 import { createErrorConverter } from './utils.js';
+/**
+ * The one converter registry of the process.
+ *
+ * Kept on `globalThis` so every copy of this module registers into, and unmarshals from, the same
+ * list: a class registered by one copy is rebuilt by another. Registration order is kept across
+ * copies, so the last registration of a type name still wins.
+ */
+const sharedConverters = () => {
+    const holder = globalThis;
+    holder[CONVERTER_REGISTRY] ??= [];
+    return holder[CONVERTER_REGISTRY];
+};
+/**
+ * The type names a class declares itself and inherits, nearest first — only names a class owns.
+ *
+ * A class that does not redeclare `typeName` inherits its parent's value, and counting that twice
+ * would let a check against the subclass match any instance of the parent.
+ */
+const lineageOf = (ctor) => {
+    const names = [];
+    let current = ctor;
+    while (typeof current === 'function') {
+        if (Object.prototype.hasOwnProperty.call(current, 'typeName')) {
+            const name = current.typeName;
+            if (typeof name === 'string') {
+                names.push(name);
+            }
+        }
+        current = Object.getPrototypeOf(current);
+    }
+    return names;
+};
+/**
+ * Whether a value is a `ResilientError` built by ANY copy of this module.
+ *
+ * Structural: the shared brand plus the `type` and `marshal` every instance carries.
+ */
+export const isResilientError = (value) => {
+    if (value == null || typeof value !== 'object') {
+        return false;
+    }
+    const candidate = value;
+    return candidate[RESILIENT_BRAND] === true
+        && typeof candidate.type === 'string'
+        && typeof candidate.marshal === 'function';
+};
 export class ResilientError extends Error {
     static separator = SEPARATOR;
     static typeName = RESILENT_ERROR;
-    static converters = [];
+    static converters = sharedConverters();
+    /**
+     * `instanceof` that holds across module copies.
+     *
+     * The native prototype check answers first. Failing that, a branded instance matches when its
+     * class lineage ENDS WITH this class's lineage — the same own type names, in the same order, up
+     * to the base. So `instanceof AuthFailedError` accepts an `AuthFailedError` (or a subclass of it)
+     * from another copy, and never a sibling class or a parent. A class that does not declare its
+     * own `typeName` cannot be told apart structurally and answers natively only.
+     */
+    static [Symbol.hasInstance](instance) {
+        if (Function.prototype[Symbol.hasInstance].call(this, instance)) {
+            return true;
+        }
+        if (!isResilientError(instance) || !Object.prototype.hasOwnProperty.call(this, 'typeName')) {
+            return false;
+        }
+        const expected = lineageOf(this);
+        const actual = lineageOf(Object.getPrototypeOf(instance)?.constructor);
+        const offset = actual.length - expected.length;
+        return offset >= 0 && expected.every((name, index) => actual[offset + index] === name);
+    }
     static registerErrorClass(resilientErrorClass, errorClass) {
         const converter = createErrorConverter(resilientErrorClass, errorClass);
         this.converters.push(converter);
@@ -11,7 +78,7 @@ export class ResilientError extends Error {
     }
     static ensure(err, throwOnUnknown) {
         err = typeof err === 'string' ? new Error(err) : err;
-        if (err instanceof ResilientError) {
+        if (isResilientError(err)) {
             return err;
         }
         // We don't proceed SyntaxError - system should crash in this case
@@ -33,14 +100,25 @@ export class ResilientError extends Error {
         }
         return new ResilientError(this.typeName, err.message, err.stack);
     }
-    static marshal(err) {
-        if (err instanceof ResilientError) {
-            return new Error([err.type, err.message, err.oiriginalStack].join(this.separator));
+    static marshal(err, opts) {
+        const resilient = isResilientError(err);
+        const structuralType = err.type;
+        const type = resilient
+            ? err.type
+            : typeof structuralType === 'string' ? structuralType : this.typeName;
+        const stack = opts?.includeStack === false
+            ? ''
+            : resilient ? err.oiriginalStack : err.stack;
+        const fields = [type, err.message, stack];
+        if (opts?.incidentId != null) {
+            fields.push(opts.incidentId);
         }
-        return new Error([this.typeName, err.message, err.stack].join(this.separator));
+        return new Error(fields.join(this.separator));
     }
     type = RESILENT_ERROR;
     oiriginalStack;
+    /** Correlates a serialized boundary error with the server log entry that owns its full stack. */
+    incidentId;
     constructor(type, message, stack) {
         super(message);
         this.type = type;
@@ -51,13 +129,18 @@ export class ResilientError extends Error {
             this.oiriginalStack = this.stack;
         }
     }
-    marshal() {
-        return ResilientError.marshal(this);
+    marshal(opts) {
+        return ResilientError.marshal(this, opts);
     }
     finalizeUnmarshal() { }
 }
-ResilientError.converters.push({
-    ...createErrorConverter(ResilientError),
-    match: () => true
-});
+// On the prototype, not the instance: non-enumerable, and inherited by every subclass of this copy.
+Object.defineProperty(ResilientError.prototype, RESILIENT_BRAND, { value: true });
+// One catch-all per process: a second module copy finds the first copy's entry and adds none.
+if (!ResilientError.converters.some(converter => converter[CATCH_ALL_CONVERTER] === true)) {
+    ResilientError.converters.push(Object.assign({
+        ...createErrorConverter(ResilientError),
+        match: () => true,
+    }, { [CATCH_ALL_CONVERTER]: true }));
+}
 //# sourceMappingURL=resilient.js.map

package/build/resilient.js.map

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

package/build/types.d.ts

@@ -1,5 +1,11 @@
 import type { ResilientError } from './resilient.js';
 export type ValueOrError<T> = T | ResilientError;
+export interface MarshalErrorOptions {
+    /** Defaults to true for backwards compatibility outside an HTTP boundary. */
+    includeStack?: boolean;
+    /** Opaque correlation value appended as the fourth wire field. */
+    incidentId?: string;
+}
 export interface Converter {
     match: (err: Error) => boolean;
     convert: (err: Error) => ResilientError;

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,cAAc,CAAA;AAEhD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAA;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,cAAc,CAAA;IACvC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAA;IACpC,SAAS,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,yBAAyB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAClF,KAAK,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;IACtD,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;IACxC,QAAQ,EAAE,MAAM,CAAA;CACjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,cAAc,CAAA;AAEhD,MAAM,WAAW,mBAAmB;IAClC,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAA;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,cAAc,CAAA;IACvC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAA;IACpC,SAAS,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,yBAAyB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAClF,KAAK,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;IACtD,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;IACxC,QAAQ,EAAE,MAAM,CAAA;CACjB"}

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtE,eAAO,MAAM,oBAAoB,wBACV,yBAAyB,eACjC,gBAAgB,KAC5B,SAQF,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,cAAc,GAAG,cAAc,cAAc,yBAAyB,WAClG,KAAK,KAAG,CAiBb,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtE,eAAO,MAAM,oBAAoB,wBACV,yBAAyB,eACjC,gBAAgB,KAC5B,SAQF,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,cAAc,GAAG,cAAc,cAAc,yBAAyB,WAClG,KAAK,KAAG,CAmBb,CAAA"}

package/build/utils.js

@@ -11,15 +11,19 @@ export const unmarshal = (errorClass) => (err) => {
     if (err instanceof errorClass) {
         return err;
     }
-    const args = err.message.split(ResilientError.separator, 3);
-    if (args.length < 2) {
+    const fields = err.message.split(ResilientError.separator, 4);
+    if (fields.length < 2) {
         throw SyntaxError('Invalid marshaled error');
     }
-    if (args[0] === errorClass.typeName) {
-        args.shift();
-    }
-    const error = new errorClass(...args);
-    error.message = args[0];
+    const [type, message, stack, incidentId] = fields;
+    // The base constructor takes (type, message, stack); subclasses take (message, stack).
+    // Keeping the base's wire type in place avoids shifting a plain Error's message into `type`.
+    const error = errorClass === ResilientError
+        ? new errorClass(type, message, stack)
+        : new errorClass(message, stack);
+    error.type = type;
+    error.message = message;
+    error.incidentId = incidentId;
     error.finalizeUnmarshal();
     return error;
 };

package/build/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAG/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,mBAA8C,EAC9C,UAA6B,EAClB,EAAE;IACb,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,IAAI,GAAG,YAAY,UAAU;QAC7D,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC;QAC/D,WAAW,EAAE,GAAG,CAAC,EAAE,CACjB,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC;QACjF,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC;KAC1C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAA4C,UAAqC,EAAE,EAAE,CAC5G,CAAC,GAAU,EAAK,EAAE;IAChB,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,OAAO,GAAQ,CAAA;IACjB,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAA8B,CAAA;IACxF,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,WAAW,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,EAAE,CAAA;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,GAAG,IAAI,CAAC,CAAA;IACrC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACvB,KAAK,CAAC,iBAAiB,EAAE,CAAA;IACzB,OAAO,KAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAG/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,mBAA8C,EAC9C,UAA6B,EAClB,EAAE;IACb,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,IAAI,GAAG,YAAY,UAAU;QAC7D,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC;QAC/D,WAAW,EAAE,GAAG,CAAC,EAAE,CACjB,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC;QACjF,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC;KAC1C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAA4C,UAAqC,EAAE,EAAE,CAC5G,CAAC,GAAU,EAAK,EAAE;IAChB,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,OAAO,GAAQ,CAAA;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;IAC7D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,WAAW,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACD,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;IACjD,uFAAuF;IACvF,6FAA6F;IAC7F,MAAM,KAAK,GAAG,UAAU,KAAK,cAAc;QACzC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC;QACtC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAClC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IACjB,KAAK,CAAC,OAAO,GAAG,OAAO,CAAA;IACvB,KAAK,CAAC,UAAU,GAAG,UAAU,CAAA;IAC7B,KAAK,CAAC,iBAAiB,EAAE,CAAA;IACzB,OAAO,KAAU,CAAA;AACnB,CAAC,CAAA"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@owlmeans/error",
-  "version": "0.1.18-rc.26",
+  "version": "0.1.18-rc.28",
   "license": "MIT",
   "type": "module",
   "scripts": {
     "build": "tsc -b",
+    "test": "bun test ./tests",
     "dev": "sleep 156 && nodemon -e ts,tsx,json --watch src --exec \"tsc -p ./tsconfig.json\"",
     "watch": "tsc -b -w --preserveWatchOutput --pretty"
   },
@@ -21,7 +22,7 @@
     }
   },
   "dependencies": {
-    "@owlmeans/i18n": "^0.1.18-rc.27"
+    "@owlmeans/i18n": "^0.1.18-rc.29"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",

package/src/consts.ts

@@ -2,3 +2,19 @@
 export const SEPARATOR = '|||'
 
 export const RESILENT_ERROR = 'ResilientError'
+
+/**
+ * Marks every `ResilientError` instance, whichever copy of this module built it.
+ *
+ * A process can hold several copies of this package (`bun --preserve-symlinks` over a linked
+ * workspace resolves one package through several `node_modules` paths), and `instanceof` answers
+ * for one copy only. `Symbol.for` returns the same symbol in every copy, so the brand is the
+ * structural proof `ensure`, `marshal` and `instanceof` read.
+ */
+export const RESILIENT_BRAND: unique symbol = Symbol.for('@owlmeans/error:resilient')
+
+/** The `globalThis` key of the converter registry every copy of this module shares. */
+export const CONVERTER_REGISTRY: unique symbol = Symbol.for('@owlmeans/error:converters')
+
+/** Marks the catch-all converter, so a second module copy does not push another one. */
+export const CATCH_ALL_CONVERTER: unique symbol = Symbol.for('@owlmeans/error:catch-all')

package/src/resilient.ts

@@ -1,13 +1,92 @@
-import { RESILENT_ERROR, SEPARATOR } from './consts.js'
-import type { Converter, ResilientErrorConstructor } from './types.js'
+import { CATCH_ALL_CONVERTER, CONVERTER_REGISTRY, RESILENT_ERROR, RESILIENT_BRAND, SEPARATOR } from './consts.js'
+import type { Converter, MarshalErrorOptions, ResilientErrorConstructor } from './types.js'
 import { createErrorConverter } from './utils.js'
 
+type ConverterHolder = typeof globalThis & { [CONVERTER_REGISTRY]?: Converter[] }
+
+/**
+ * The one converter registry of the process.
+ *
+ * Kept on `globalThis` so every copy of this module registers into, and unmarshals from, the same
+ * list: a class registered by one copy is rebuilt by another. Registration order is kept across
+ * copies, so the last registration of a type name still wins.
+ */
+const sharedConverters = (): Converter[] => {
+  const holder = globalThis as ConverterHolder
+  holder[CONVERTER_REGISTRY] ??= []
+
+  return holder[CONVERTER_REGISTRY]
+}
+
+/**
+ * The type names a class declares itself and inherits, nearest first — only names a class owns.
+ *
+ * A class that does not redeclare `typeName` inherits its parent's value, and counting that twice
+ * would let a check against the subclass match any instance of the parent.
+ */
+const lineageOf = (ctor: unknown): string[] => {
+  const names: string[] = []
+  let current = ctor
+  while (typeof current === 'function') {
+    if (Object.prototype.hasOwnProperty.call(current, 'typeName')) {
+      const name = (current as { typeName?: unknown }).typeName
+      if (typeof name === 'string') {
+        names.push(name)
+      }
+    }
+    current = Object.getPrototypeOf(current)
+  }
+
+  return names
+}
+
+/**
+ * Whether a value is a `ResilientError` built by ANY copy of this module.
+ *
+ * Structural: the shared brand plus the `type` and `marshal` every instance carries.
+ */
+export const isResilientError = (value: unknown): value is ResilientError => {
+  if (value == null || typeof value !== 'object') {
+    return false
+  }
+  const candidate = value as { [RESILIENT_BRAND]?: unknown, type?: unknown, marshal?: unknown }
+
+  return candidate[RESILIENT_BRAND] === true
+    && typeof candidate.type === 'string'
+    && typeof candidate.marshal === 'function'
+}
+
 export class ResilientError extends Error {
   public static separator: string = SEPARATOR
 
   public static typeName: string = RESILENT_ERROR
 
-  public static converters: Converter[] = []
+  public static converters: Converter[] = sharedConverters()
+
+  /**
+   * `instanceof` that holds across module copies.
+   *
+   * The native prototype check answers first. Failing that, a branded instance matches when its
+   * class lineage ENDS WITH this class's lineage — the same own type names, in the same order, up
+   * to the base. So `instanceof AuthFailedError` accepts an `AuthFailedError` (or a subclass of it)
+   * from another copy, and never a sibling class or a parent. A class that does not declare its
+   * own `typeName` cannot be told apart structurally and answers natively only.
+   */
+  public static override [Symbol.hasInstance]<T extends abstract new (...args: any[]) => any>(
+    this: T, instance: unknown
+  ): instance is InstanceType<T> {
+    if (Function.prototype[Symbol.hasInstance].call(this, instance)) {
+      return true
+    }
+    if (!isResilientError(instance) || !Object.prototype.hasOwnProperty.call(this, 'typeName')) {
+      return false
+    }
+    const expected = lineageOf(this)
+    const actual = lineageOf(Object.getPrototypeOf(instance)?.constructor)
+    const offset = actual.length - expected.length
+
+    return offset >= 0 && expected.every((name, index) => actual[offset + index] === name)
+  }
 
   public static registerErrorClass(resilientErrorClass: ResilientErrorConstructor, errorClass?: ErrorConstructor): Converter {
     const converter = createErrorConverter(resilientErrorClass, errorClass)
@@ -18,7 +97,7 @@ export class ResilientError extends Error {
 
   public static ensure(err: Error | string, throwOnUnknown?: boolean): ResilientError {
     err = typeof err === 'string' ? new Error(err) : err
-    if (err instanceof ResilientError) {
+    if (isResilientError(err)) {
       return err
     }
 
@@ -46,18 +125,30 @@ export class ResilientError extends Error {
     return new ResilientError(this.typeName, err.message, err.stack)
   }
 
-  public static marshal(err: Error): Error {
-    if (err instanceof ResilientError) {
-      return new Error([err.type, err.message, err.oiriginalStack].join(this.separator))
+  public static marshal(err: Error, opts?: MarshalErrorOptions): Error {
+    const resilient = isResilientError(err)
+    const structuralType = (err as Error & { type?: unknown }).type
+    const type = resilient
+      ? err.type
+      : typeof structuralType === 'string' ? structuralType : this.typeName
+    const stack = opts?.includeStack === false
+      ? ''
+      : resilient ? err.oiriginalStack : err.stack
+    const fields: Array<string | undefined> = [type, err.message, stack]
+    if (opts?.incidentId != null) {
+      fields.push(opts.incidentId)
     }
 
-    return new Error([this.typeName, err.message, err.stack].join(this.separator))
+    return new Error(fields.join(this.separator))
   }
 
   public type: string = RESILENT_ERROR
 
   public oiriginalStack?: string
 
+  /** Correlates a serialized boundary error with the server log entry that owns its full stack. */
+  public incidentId?: string
+
   constructor(type: string, message: string, stack?: string) {
     super(message)
     this.type = type
@@ -68,14 +159,20 @@ export class ResilientError extends Error {
     }
   }
 
-  marshal(): Error {
-    return ResilientError.marshal(this)
+  marshal(opts?: MarshalErrorOptions): Error {
+    return ResilientError.marshal(this, opts)
   }
 
   finalizeUnmarshal(): void { }
 }
 
-ResilientError.converters.push({
-  ...createErrorConverter(ResilientError as ResilientErrorConstructor),
-  match: () => true
-})
+// On the prototype, not the instance: non-enumerable, and inherited by every subclass of this copy.
+Object.defineProperty(ResilientError.prototype, RESILIENT_BRAND, { value: true })
+
+// One catch-all per process: a second module copy finds the first copy's entry and adds none.
+if (!ResilientError.converters.some(converter => (converter as { [CATCH_ALL_CONVERTER]?: unknown })[CATCH_ALL_CONVERTER] === true)) {
+  ResilientError.converters.push(Object.assign({
+    ...createErrorConverter(ResilientError as ResilientErrorConstructor),
+    match: () => true,
+  }, { [CATCH_ALL_CONVERTER]: true }))
+}

package/src/types.ts

@@ -2,6 +2,13 @@ import type { ResilientError } from './resilient.js'
 
 export type ValueOrError<T> = T | ResilientError
 
+export interface MarshalErrorOptions {
+  /** Defaults to true for backwards compatibility outside an HTTP boundary. */
+  includeStack?: boolean
+  /** Opaque correlation value appended as the fourth wire field. */
+  incidentId?: string
+}
+
 export interface Converter {
   match: (err: Error) => boolean
   convert: (err: Error) => ResilientError

package/src/utils.ts

@@ -19,17 +19,19 @@ export const unmarshal = <T extends ResilientError = ResilientError>(errorClass:
     if (err instanceof errorClass) {
       return err as T
     }
-    const args = err.message.split(ResilientError.separator, 3) as [string, string, string?]
-    if (args.length < 2) {
+    const fields = err.message.split(ResilientError.separator, 4)
+    if (fields.length < 2) {
       throw SyntaxError('Invalid marshaled error')
     }
-
-    if (args[0] === errorClass.typeName) {
-      args.shift()
-    }
-
-    const error = new errorClass(...args)
-    error.message = args[0]
+    const [type, message, stack, incidentId] = fields
+    // The base constructor takes (type, message, stack); subclasses take (message, stack).
+    // Keeping the base's wire type in place avoids shifting a plain Error's message into `type`.
+    const error = errorClass === ResilientError
+      ? new errorClass(type, message, stack)
+      : new errorClass(message, stack)
+    error.type = type
+    error.message = message
+    error.incidentId = incidentId
     error.finalizeUnmarshal()
     return error as T
   }

package/tests/copies.spec.ts

@@ -0,0 +1,138 @@
+import { afterAll, beforeAll, describe, expect, test } from 'bun:test'
+import { cpSync, mkdtempSync, rmSync, symlinkSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
+
+type Lib = typeof import('../src/index.js')
+
+/**
+ * Two module instances of this package in one process — what `bun --preserve-symlinks` produces
+ * when a linked workspace reaches `@owlmeans/error` through two `node_modules` paths.
+ *
+ * The sources are copied to two directories, so every module of the package (not only the entry)
+ * is loaded twice. `@owlmeans/i18n` resolves through a `node_modules` link to the workspace root.
+ */
+const loadTwice = async (): Promise<{ root: string, a: Lib, b: Lib }> => {
+  const root = mkdtempSync(join(tmpdir(), 'owlmeans-error-copies-'))
+  const workspaceModules = resolve(import.meta.dir, '../../../node_modules')
+  for (const name of ['a', 'b']) {
+    cpSync(resolve(import.meta.dir, '../src'), join(root, name, 'src'), { recursive: true })
+    symlinkSync(workspaceModules, join(root, name, 'node_modules'))
+  }
+  const a = await import(join(root, 'a', 'src', 'index.ts')) as Lib
+  const b = await import(join(root, 'b', 'src', 'index.ts')) as Lib
+
+  return { root, a, b }
+}
+
+/** The same family declared by each copy, the way two copies of one package declare it. */
+const familyOf = (lib: Lib) => {
+  class CopyApiError extends lib.ResilientError {
+    public static override typeName = 'CopyTestApiError'
+
+    constructor(message: string = 'error') {
+      super(CopyApiError.typeName, `copy-api:${message}`)
+    }
+  }
+
+  class CopyAuthFailed extends CopyApiError {
+    public static override typeName = 'CopyTestAuthFailedError'
+
+    constructor(message: string = 'error') {
+      super(`auth:${message}`)
+      this.type = CopyAuthFailed.typeName
+    }
+  }
+
+  class CopyAccess extends CopyApiError {
+    public static override typeName = 'CopyTestAccessError'
+
+    constructor(message: string = 'error') {
+      super(`access:${message}`)
+      this.type = CopyAccess.typeName
+    }
+  }
+
+  lib.ResilientError.registerErrorClass(CopyApiError)
+  lib.ResilientError.registerErrorClass(CopyAuthFailed)
+  lib.ResilientError.registerErrorClass(CopyAccess)
+
+  return { CopyApiError, CopyAuthFailed, CopyAccess }
+}
+
+describe('duplicate module copies behave as one', () => {
+  let root = ''
+  let a: Lib
+  let b: Lib
+  let A: ReturnType<typeof familyOf>
+  let B: ReturnType<typeof familyOf>
+
+  beforeAll(async () => {
+    ({ root, a, b } = await loadTwice())
+    A = familyOf(a)
+    B = familyOf(b)
+  })
+
+  afterAll(() => {
+    if (root !== '') {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  test('the two copies are distinct module instances sharing one registry', () => {
+    expect(a.ResilientError).not.toBe(b.ResilientError)
+    expect(a.ResilientError.converters).toBe(b.ResilientError.converters)
+    const catchAll = Symbol.for('@owlmeans/error:catch-all')
+    expect(b.ResilientError.converters.filter(converter => (converter as any)[catchAll] === true)).toHaveLength(1)
+  })
+
+  test('an error thrown by copy A is ensured as-is and marshalled with its type by copy B', () => {
+    const thrown = new A.CopyAuthFailed('no-guard')
+
+    expect(b.ResilientError.ensure(thrown)).toBe(thrown)
+    expect(b.isResilientError(thrown)).toBe(true)
+    const wire = b.ResilientError.marshal(b.ResilientError.ensure(thrown)).message
+    expect(wire.split(b.SEPARATOR).slice(0, 2)).toEqual(['CopyTestAuthFailedError', 'copy-api:auth:no-guard'])
+
+    const rebuilt = b.ResilientError.ensure(wire)
+    // The last registration of the type name wins — copy B registered after copy A.
+    expect(rebuilt.constructor).toBe(B.CopyAuthFailed)
+    expect(rebuilt).toBeInstanceOf(A.CopyAuthFailed)
+    expect(rebuilt.type).toBe('CopyTestAuthFailedError')
+    expect(rebuilt.message).toBe('copy-api:auth:no-guard')
+  })
+
+  test('a class registered by one copy only is rebuilt by the other', () => {
+    class OnlyInA extends a.ResilientError {
+      public static override typeName = 'CopyTestOnlyInA'
+
+      constructor(message: string = 'error') {
+        super(OnlyInA.typeName, `only-a:${message}`)
+      }
+    }
+    a.ResilientError.registerErrorClass(OnlyInA)
+
+    const rebuilt = b.ResilientError.ensure(new OnlyInA('x').marshal().message)
+    expect(rebuilt).toBeInstanceOf(OnlyInA)
+    expect(rebuilt.message).toBe('only-a:x')
+  })
+
+  test('instanceof across copies matches the class and its ancestors, never a sibling or a parent', () => {
+    const thrown = new A.CopyAuthFailed('x')
+    expect(thrown instanceof B.CopyAuthFailed).toBe(true)
+    expect(thrown instanceof B.CopyApiError).toBe(true)
+    expect(thrown instanceof b.ResilientError).toBe(true)
+    expect(thrown instanceof B.CopyAccess).toBe(false)
+    expect(new A.CopyApiError('x') instanceof B.CopyAuthFailed).toBe(false)
+
+    // A subclass without a type name of its own is matched natively only.
+    class Unnamed extends B.CopyAuthFailed { }
+    expect(new A.CopyAuthFailed('x') instanceof Unnamed).toBe(false)
+    expect(new Unnamed('x') instanceof A.CopyAuthFailed).toBe(true)
+
+    // Shape alone is not a resilient error: the brand is.
+    const lookalike = Object.assign(new Error('x'), { type: 'CopyTestAuthFailedError', marshal: () => new Error('x') })
+    expect(lookalike instanceof b.ResilientError).toBe(false)
+    expect(b.ResilientError.ensure(lookalike)).not.toBe(lookalike)
+  })
+})

package/tests/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "extends": [
+    "@owlmeans/dep-config/tsconfig.base.json",
+    "@owlmeans/dep-config/tsconfig.node.json"
+  ],
+  "compilerOptions": {
+    "types": [
+      "bun"
+    ],
+    "rootDir": "../",
+    "noEmit": true
+  },
+  "include": [
+    "./**/*",
+    "../src/**/*"
+  ]
+}

package/tsconfig.json

@@ -6,5 +6,5 @@
     "rootDir": "./src/",
     "outDir": "./build/"
   },
-  "exclude": ["./dist/**/*", "./build/**/*", "./*.ts"]
+  "exclude": ["./dist/**/*", "./build/**/*", "./tests/**/*", "./*.ts"]
 }