bazis 0.98.17 → 0.98.19

package/core/infra/connectors/codex/CodexAppServerClient.ts

@@ -232,7 +232,7 @@ export class CodexAppServerClient implements CodexClient {
         if (method === "account/updated") this.modelCache = undefined;
       }, () => { this.clearLogin(); this.modelCache = undefined; });
       const initialized = await client.request("initialize", {
-        clientInfo: { name: "bazis", title: "Bazis", version: "0.98.17" }, capabilities: { experimentalApi: true },
+        clientInfo: { name: "bazis", title: "Bazis", version: "0.98.19" }, capabilities: { experimentalApi: true },
       }, 15_000, signal);
       if (resolve(text(initialized.codexHome, 4096)) !== this.paths.home) throw new CodexError("PROTOCOL_ERROR");
       client.notify("initialized");

package/library/orm/Providers/PostgresProvider.ts

@@ -828,6 +828,7 @@ export class PostgresProvider implements DatabaseProvider {
     let result!: T;
     let failure: unknown;
     try {
+      this.traceSql("BEGIN", []);
       await this.ownerCommand(owner, "BEGIN");
       await this.configureSession(owner);
       result = await this.transactionCallbacks.run(callbacks, () => this.ambient.run({ executor, session: owner.session, owner }, async () => {
@@ -837,6 +838,7 @@ export class PostgresProvider implements DatabaseProvider {
       }));
       operation.signal.throwIfAborted();
       committing = true;
+      this.traceSql("COMMIT", []);
       await this.ownerCommand(owner, "COMMIT");
       committed = true;
     } catch (error) {
@@ -850,6 +852,7 @@ export class PostgresProvider implements DatabaseProvider {
           if (operation.signal.aborted || owner.quarantinePromise) await this.quarantineOwner(owner);
           else {
             const cleanup = new OperationDeadline(this.cancellationTimeoutMs);
+            this.traceSql("ROLLBACK", []);
             try { await cleanup.wait(this.native(() => owner.session.unsafe("ROLLBACK"))); }
             catch { await this.quarantineOwner(owner); }
             finally { cleanup.dispose(); }
@@ -1265,6 +1268,7 @@ export class PostgresProvider implements DatabaseProvider {
     const rollback = async () => {
       // No further owner dispatch can pass the synchronous quarantine fence.
       await deadline.wait(Promise.allSettled([...(owner.pending ?? [])]));
+      this.traceSql("ROLLBACK", []);
       await deadline.wait(this.native(() => { deadline.signal.throwIfAborted(); return owner.session.unsafe("ROLLBACK"); }, true));
       const current = await this.readBackendIdentity(owner.session, deadline);
       if (Object.entries(identity).some(([key, value]) => current[key as keyof BackendIdentity] !== value)) throw new OrmTransactionScopeError("PostgreSQL rollback backend identity changed.");

package/library/orm/Providers/operationDeadline.ts

@@ -11,11 +11,12 @@ export class OperationDeadline {
   readonly controller = new AbortController();
   readonly signal = this.controller.signal;
   private readonly timer: ReturnType<typeof setTimeout>;
-  private readonly onAbort = () => this.controller.abort(new OrmTransactionScopeError("ORM operation was aborted."));
+  // A parent deadline's reason (for example a scope timeout) survives nesting.
+  private readonly onAbort = () => this.controller.abort(this.parent?.reason instanceof OrmTransactionScopeError ? this.parent.reason : new OrmTransactionScopeError(`${this.label} was aborted.`));
 
-  constructor(timeoutMs: number, private readonly parent?: AbortSignal) {
+  constructor(timeoutMs: number, private readonly parent?: AbortSignal, private readonly label = "ORM operation") {
     if (parent !== undefined && !(parent instanceof AbortSignal)) throw new TypeError("signal must be an AbortSignal.");
-    this.timer = setTimeout(() => this.controller.abort(new OrmTransactionScopeError("ORM operation deadline exceeded.")), timeoutMs);
+    this.timer = setTimeout(() => this.controller.abort(new OrmTransactionScopeError(`${label} timed out after ${timeoutMs} ms.`)), timeoutMs);
     if (parent?.aborted) this.onAbort();
     else parent?.addEventListener("abort", this.onAbort, { once: true });
   }

package/library/orm/Query/EntityQuery.ts

@@ -207,6 +207,8 @@ export class EntityQuery<T extends object, TResult = T> {
 }
 
 function assertSkipLocked(model: EntityModel, runtime: DbContextRuntime, plan: QueryPlan, terminal: "toList" | "count"): void {
+  // Outside a transaction PostgreSQL releases the lock right after the SELECT.
+  if (plan.rowLock && !plan.skipLocked && runtime.provider.isTransactionActive?.() !== true) throw new Error("forUpdate() locks rows only until the surrounding transaction ends; outside a transaction the lock is released right after the SELECT. Run the read and the following saveChanges() inside db.transactionScope(async () => { ... }).");
   if (!plan.skipLocked) return;
   if (terminal !== "toList" || runtime.provider.isTransactionActive?.() !== true || plan.conditions.length === 0 || plan.invalidRequestedLimit !== undefined || !Number.isSafeInteger(plan.limit) || plan.limit! <= 0 || plan.requestedLimit !== undefined && plan.requestedLimit !== plan.limit || plan.offset !== undefined || plan.projections.length !== 0 || plan.includes.length !== 0) throw new Error("FOR UPDATE SKIP LOCKED requires an active transaction, where, positive take, and terminal materialization.");
   const ordered = new Set(plan.orders.map((order) => order.property));

package/library/orm/Query/ImmediateMutations.ts

@@ -1,6 +1,6 @@
 import { types } from "node:util";
 import { OrmError, OrmTrackedMutationConflictError, OrmUndeclaredConflictTargetError, OrmUnsafeImmediateMutationError } from "../errors";
-import type { EntityModel, PropertyModel } from "../Metadata/types";
+import { isDatabaseGenerated, type EntityModel, type PropertyModel } from "../Metadata/types";
 import type { DbContextRuntime } from "../runtime";
 import { hasTrackedEntriesForModel } from "../Tracking/ChangeTracker";
 import { isPostgresJsonScalarParameter } from "../Providers/PostgresDialect";
@@ -16,7 +16,7 @@ export type OrmUniqueKeySelectorV1<T extends object> = (entity: FieldSelector<T>
 
 export function executeImmediateUpdate<T extends object>(model: EntityModel, runtime: DbContextRuntime, plan: QueryPlan, values: OrmUpdateValuesV1<T>): Promise<OrmMutationResultV1> {
   return runtime.runImmediateOperation(async () => {
-    guard(model, runtime); const admittedPlan = admitPlan(plan);
+    guard(model, runtime); const admittedPlan = admitPlan(plan, "executeUpdate");
     const conditions = effectiveConditions(model, admittedPlan); const assignments = encodeAssignments(runtime, admitUpdateValues(model, values));
     const compiled = new SqlTranslator(model, runtime.provider.dialect).immediateUpdate(assignments, conditions, (property, value) => encode(runtime, property, snapshot(value), true));
     Object.freeze(compiled.params);
@@ -28,7 +28,7 @@ export function executeImmediateUpdate<T extends object>(model: EntityModel, run
 
 export function executeImmediateDelete(model: EntityModel, runtime: DbContextRuntime, plan: QueryPlan): Promise<OrmMutationResultV1> {
   return runtime.runImmediateOperation(async () => {
-    guard(model, runtime); const admittedPlan = admitPlan(plan); const conditions = effectiveConditions(model, admittedPlan);
+    guard(model, runtime); const admittedPlan = admitPlan(plan, "executeDelete"); const conditions = effectiveConditions(model, admittedPlan);
     const compiled = new SqlTranslator(model, runtime.provider.dialect).immediateDelete(conditions, (property, value) => encode(runtime, property, snapshot(value), true));
     Object.freeze(compiled.params);
     guard(model, runtime);
@@ -52,13 +52,14 @@ export function insertIfAbsent<T extends object>(model: EntityModel, runtime: Db
 }
 
 function guard(model: EntityModel, runtime: DbContextRuntime): void {
-  if (hasTrackedEntriesForModel(runtime.tracker, model)) throw new OrmTrackedMutationConflictError();
+  if (hasTrackedEntriesForModel(runtime.tracker, model)) throw new OrmTrackedMutationConflictError(model.name);
 }
 interface AdmittedImmediatePlan { readonly explicitConditions: readonly Condition[]; readonly ignoreQueryFilters: boolean; }
-function admitPlan(plan: QueryPlan): AdmittedImmediatePlan {
+function admitPlan(plan: QueryPlan, terminal: "executeUpdate" | "executeDelete"): AdmittedImmediatePlan {
   try {
     if (types.isProxy(plan) || typeof plan !== "object" || plan === null || Object.getPrototypeOf(plan) !== Object.prototype) unsafe();
     const fields = Object.getOwnPropertyDescriptors(plan); const names = Object.getOwnPropertyNames(plan); if (Object.getOwnPropertySymbols(plan).length !== 0) unsafe();
+    explainPlan(fields, terminal);
     const required = ["conditions", "orders", "noTracking", "includes", "ignoreQueryFilters", "projections"];
     const optional = ["limit", "requestedLimit", "invalidRequestedLimit", "offset", "rowLock", "skipLocked"];
     if (names.length !== required.length || required.some((key) => !Object.prototype.hasOwnProperty.call(fields, key)) || optional.some((key) => Object.prototype.hasOwnProperty.call(fields, key))) unsafe();
@@ -70,32 +71,69 @@ function admitPlan(plan: QueryPlan): AdmittedImmediatePlan {
     return Object.freeze({ explicitConditions: Object.freeze(explicitConditions), ignoreQueryFilters: fields.ignoreQueryFilters!.value });
   } catch (error) { if (error instanceof OrmUnsafeImmediateMutationError) throw error; unsafe(); }
 }
+/** Names the query method that an immediate mutation does not accept; reads data descriptors only. */
+function explainPlan(fields: Record<string, PropertyDescriptor>, terminal: string): void {
+  const valueOf = (key: string) => { const descriptor = fields[key]; return descriptor && "value" in descriptor ? descriptor.value as unknown : undefined; };
+  const length = (key: string) => { const value = valueOf(key); return Array.isArray(value) && !types.isProxy(value) ? Object.getOwnPropertyDescriptor(value, "length")?.value as unknown : undefined; };
+  if (valueOf("noTracking") !== true) unsafe(`call .asNoTracking() before ${terminal}(); immediate mutations bypass the change tracker`);
+  if (["limit", "requestedLimit", "invalidRequestedLimit", "offset"].some((key) => key in fields)) unsafe(`${terminal}() does not accept take() or skip(); narrow the rows with where(...)`);
+  if ("rowLock" in fields || "skipLocked" in fields) unsafe(`${terminal}() does not accept forUpdate()`);
+  for (const [key, method] of [["orders", "orderBy()"], ["includes", "include()"], ["projections", "select()"]] as const) {
+    const size = length(key); if (typeof size === "number" && size > 0) unsafe(`${terminal}() does not accept ${method}`);
+  }
+  if (length("conditions") === 0) unsafe(`add .where(...) before ${terminal}(); changing every row of a table is not allowed, use raw SQL for that`);
+}
 function count(value: unknown): number { if (!Number.isSafeInteger(value) || (value as number) < 0) throw new OrmError("ORM provider returned an invalid immediate mutation count."); return value as number; }
-function unsafe(): never { throw new OrmUnsafeImmediateMutationError(); }
+function unsafe(reason?: string): never { throw new OrmUnsafeImmediateMutationError(reason); }
+function describeValue(value: unknown): string {
+  if (value === null) return "null";
+  if (Array.isArray(value)) return "array";
+  if (value instanceof Date) return "Date";
+  if (value instanceof Uint8Array) return "Uint8Array";
+  return typeof value;
+}
+function functionValue(name: string): never { unsafe(`"${name}" must be a value, got a function; expressions such as views + 1 are not supported, use raw SQL for them`); }
 
 interface AdmittedAssignment { readonly property: PropertyModel; readonly value: unknown; }
 function admitUpdateValues<T extends object>(model: EntityModel, values: OrmUpdateValuesV1<T>): readonly AdmittedAssignment[] {
-  if (!plain(values)) unsafe();
-  const descriptors = ownData(values); const keys = [...descriptors.keys()]; if (keys.length === 0) unsafe();
+  if (!plain(values)) unsafe('pass the new values as a plain object, for example { status: "archived" }');
+  const descriptors = ownData(values); const keys = [...descriptors.keys()]; if (keys.length === 0) unsafe("pass at least one property to set");
   const out: AdmittedAssignment[] = [];
   for (const key of keys) {
     const descriptor = descriptors.get(key)!;
-    const property = model.propertyByName(key); if (!property || property.isKey || property.generation !== "none" || property.convention || descriptor.value === undefined || descriptor.value === null) unsafe();
+    const property = model.propertyByName(key);
+    if (!property) unsafe(`"${key}" is not a mapped property of ${model.name}`);
+    if (property.isKey) unsafe(`"${key}" is the primary key of ${model.name} and cannot be changed`);
+    if (property.generation !== "none" || property.convention) unsafe(`"${key}" is filled automatically and cannot be set`);
+    if (descriptor.value === undefined) unsafe(`"${key}" is undefined; omit it or pass a value`);
+    if (descriptor.value === null) {
+      if (property.required) unsafe(`"${key}" is required (NOT NULL) and cannot be set to null`);
+      out.push(Object.freeze({ property, value: null })); continue;
+    }
+    if (typeof descriptor.value === "function") functionValue(key);
     out.push(Object.freeze({ property, value: snapshot(descriptor.value) }));
   }
   return Object.freeze(out.map((value) => Object.freeze(value)));
 }
 function admitInsertValues<T extends object>(model: EntityModel, entity: T): readonly AdmittedAssignment[] {
-  if (!objectInput(entity)) unsafe();
+  if (!objectInput(entity)) unsafe("pass an entity object to insertIfAbsent()");
   const descriptors = ownData(entity);
   const out: AdmittedAssignment[] = [];
   for (const property of model.properties) {
-    const descriptor = descriptors.get(property.propertyName); if (!descriptor || descriptor.value === undefined) unsafe();
-    if (descriptor.value === null) { if (property.required) unsafe(); out.push(Object.freeze({ property, value: null })); continue; }
+    const descriptor = descriptors.get(property.propertyName);
+    // An unset generated key is assigned as by saveChanges(); the caller's entity stays unchanged.
+    if (property.isKey && model.key.length === 1 && unsetKey(descriptor?.value)) {
+      if (isDatabaseGenerated(property.generation)) continue;
+      if (property.generation === "uuidV7") { out.push(Object.freeze({ property, value: Bun.randomUUIDv7() })); continue; }
+    }
+    if (!descriptor || descriptor.value === undefined) unsafe(`"${property.propertyName}" is missing; pass an entity with every mapped property of ${model.name}`);
+    if (descriptor.value === null) { if (property.required) unsafe(`"${property.propertyName}" is required (NOT NULL); got null`); out.push(Object.freeze({ property, value: null })); continue; }
+    if (typeof descriptor.value === "function") functionValue(property.propertyName);
     out.push(Object.freeze({ property, value: snapshot(descriptor.value) }));
   }
   return Object.freeze(out.map((value) => Object.freeze(value)));
 }
+function unsetKey(value: unknown): boolean { return value === undefined || value === null || value === "" || value === 0; }
 function encodeAssignments(runtime: DbContextRuntime, assignments: readonly AdmittedAssignment[]): readonly { readonly property: PropertyModel; readonly value: SqlParam }[] {
   return Object.freeze(assignments.map(({ property, value }) => Object.freeze({ property, value: value === null ? null : encode(runtime, property, value) })));
 }
@@ -104,7 +142,11 @@ function encode(runtime: DbContextRuntime, property: PropertyModel, input: unkno
     const providerValue = property.converter ? property.converter.toProvider(input) : input;
     const safeProvider = storageValue(providerValue, property.type, allowNull);
     return snapshotEncodedSqlParam(runtime.provider.dialect.encode(safeProvider, property.type));
-  } catch { unsafe(); }
+  } catch {
+    // Hostile inputs keep the generic message; describing them could run their traps.
+    if (typeof input === "object" && input !== null && types.isProxy(input)) unsafe();
+    unsafe(property.converter ? `"${property.propertyName}" could not be converted for its ${property.type} column` : `"${property.propertyName}" expects ${property.type}, got ${describeValue(input)}`);
+  }
 }
 
 function conflictTarget<T extends object>(model: EntityModel, options: { readonly conflictBy: OrmUniqueKeySelectorV1<T> }): readonly string[] {
@@ -120,11 +162,18 @@ function conflictTarget<T extends object>(model: EntityModel, options: { readonl
   if (!Number.isSafeInteger(length) || length < 1 || targetDescriptors.size !== length + 1) unsafe();
   const properties: string[] = [];
   for (let index = 0; index < length; index += 1) { const operand = targetDescriptors.get(String(index))?.value; if (typeof operand !== "object" || operand === null || types.isProxy(operand)) unsafe(); const property = issued.get(operand as Operand); if (!property) unsafe(); properties.push(property); }
-  if (new Set(properties).size !== properties.length) throw new OrmUndeclaredConflictTargetError();
+  const repeated = properties.find((name, index) => properties.indexOf(name) !== index);
+  if (repeated !== undefined) throw new OrmUndeclaredConflictTargetError(`conflictBy lists "${repeated}" more than once`);
   const columns = properties.map((name) => model.propertyByName(name)?.columnName);
-  if (columns.some((column) => column === undefined)) throw new OrmUndeclaredConflictTargetError();
+  const unknown = properties.find((_name, index) => columns[index] === undefined);
+  if (unknown !== undefined) throw new OrmUndeclaredConflictTargetError(`conflictBy uses "${unknown}", which is not a mapped property of ${model.name}`);
   const candidates = [model.key.map((property) => property.columnName), ...model.indexes.filter((index) => index.unique).map((index) => index.columns)];
-  if (!candidates.some((candidate) => candidate.length === columns.length && candidate.every((column, index) => column === columns[index]))) throw new OrmUndeclaredConflictTargetError();
+  if (!candidates.some((candidate) => candidate.length === columns.length && candidate.every((column, index) => column === columns[index]))) {
+    // Candidates are physical columns; the message speaks in property names, in the declared order.
+    const propertyOf = (column: string) => model.properties.find((property) => property.columnName === column)?.propertyName ?? column;
+    const options = candidates.map((candidate) => `(${candidate.map(propertyOf).join(", ")})`).join(", ");
+    throw new OrmUndeclaredConflictTargetError(`conflictBy (${properties.join(", ")}) is not the primary key or a unique index of ${model.name}. Use one of: ${options}; or declare @Index({ unique: true }) on these properties`);
+  }
   return Object.freeze(columns as string[]);
 }
 

package/library/orm/Transactions/TransactionScopeCoordinator.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import type { DbContext } from "../DbContext";
-import { ConcurrentTransactionScopeError, OrmDatabaseTimeError, OrmProviderIdentityMismatchError, OrmTransactionScopeError } from "../errors";
+import { ConcurrentTransactionScopeError, differentProviderMessage, OrmDatabaseTimeError, OrmProviderIdentityMismatchError, OrmTransactionScopeError } from "../errors";
 import { baseProvider, withPostgresScopeOptions, createObservedProvider, postgresTransactionCapability, rootAuthority, withProviderDispatchObserver, withoutProviderDispatchObserver, type CancellableProviderDispatch } from "../Providers/ormTransactionRuntime";
 import type { DatabaseProvider } from "../Providers/types";
 import { OrmTransaction, type OrmDatabaseTimeV1, type OrmTransactionScopeOptions } from "./OrmTransaction";
@@ -47,6 +47,27 @@ const uncertainContexts = new WeakSet<object>();
 const contextTokens = new WeakMap<object, object>();
 const contextProviders = new WeakMap<object, DatabaseProvider>();
 
+const contextName = (context: object): string => (context.constructor as { readonly name?: string } | undefined)?.name || "This DbContext";
+const scopeClosed = () => new OrmTransactionScopeError("ORM transaction scope has already finished or is closing; await every ORM call inside the scope callback.");
+const nestedScopeRunning = () => new OrmTransactionScopeError("A nested transaction scope is still running; await it before using the outer scope.");
+const notEnrolled = (context: object) => new OrmTransactionScopeError(`${contextName(context)} is not part of the surrounding transaction scope. Run it through tx.use(context, work) to share the transaction, or use it after the scope.`);
+
+/** Explains why `context` cannot run ORM work in the current scope view. */
+function scopeRejection(context: object, view: View): OrmTransactionScopeError {
+  const provider = contextProviders.get(context);
+  if (provider && rootAuthority(provider) !== view.frame.authority) return new OrmTransactionScopeError(differentProviderMessage(contextName(context)));
+  if (!view.enrolled.has(contextToken(context))) return notEnrolled(context);
+  if (view.frame.state !== "active") return scopeClosed();
+  return view.frame.activeChild !== undefined ? nestedScopeRunning() : new OrmTransactionScopeError();
+}
+
+/** A failed operation dooms its scope; a callback that caught the error still learns why. */
+function operationFailed(error: unknown): OrmTransactionScopeError {
+  if (error instanceof OrmTransactionScopeError) return error;
+  const reason = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+  return new OrmTransactionScopeError(`ORM transaction scope was rolled back because an operation inside it failed: ${reason}. A failed operation marks the whole scope for rollback even when its error is caught; to continue after an expected failure, run that operation in a nested transactionScope().`, { cause: error });
+}
+
 /** Private, non-barrel signal: SaveExecutor uses it to suppress retries only
  * in a coordinator-owned ORM scope, never in arbitrary provider transactions. */
 export function isNewOrmTransactionScopeActive(): boolean {
@@ -69,7 +90,7 @@ export function observedProvider(context: object, provider: DatabaseProvider): D
     if (!view) return guarded();
     const frame = view.frame;
     if (frame.authority !== authority || !view.enrolled.has(token) || frame.state !== "active" || frame.activeChild !== undefined) {
-      return Promise.reject(new OrmTransactionScopeError());
+      return Promise.reject(scopeRejection(context, view));
     }
     return trackTask(frame, guarded);
   };
@@ -87,7 +108,7 @@ export function monitorWholeOperation<T>(context: object, operation: () => Promi
   if (uncertainContexts.has(contextToken(context))) return Promise.reject(new TransactionOutcomeUnknownError());
   const view = views.getStore();
   if (!view) return operation();
-  if (!view.enrolled.has(contextToken(context)) || view.frame.state !== "active" || view.frame.activeChild !== undefined) return Promise.reject(new OrmTransactionScopeError());
+  if (!view.enrolled.has(contextToken(context)) || view.frame.state !== "active" || view.frame.activeChild !== undefined) return Promise.reject(scopeRejection(context, view));
   // Save work must not inherit a forever `use` callback task: only its
   // post-validation unwind is framework-owned during physical quarantine.
   return trackTask(view.frame, operation, "save", true);
@@ -99,11 +120,11 @@ export function monitorImmediateOperation<T>(context: object, operation: () => T
   const view = views.getStore();
   const token = contextToken(context);
   const run = () => Promise.resolve().then(() => {
-    if (view && (!view.enrolled.has(token) || view.frame.state !== "active" || view.frame.activeChild !== undefined)) throw new OrmTransactionScopeError();
+    if (view && (!view.enrolled.has(token) || view.frame.state !== "active" || view.frame.activeChild !== undefined)) throw scopeRejection(context, view);
     return operation();
   });
   if (!view) return run();
-  if (!view.enrolled.has(token) || view.frame.state !== "active" || view.frame.activeChild !== undefined) return Promise.reject(new OrmTransactionScopeError());
+  if (!view.enrolled.has(token) || view.frame.state !== "active" || view.frame.activeChild !== undefined) return Promise.reject(scopeRejection(context, view));
   return trackTask(view.frame, run, "immediate", true);
 }
 
@@ -123,9 +144,9 @@ export function markCurrentSaveRequiresUnwind(): void {
 function trackTask<T>(frame: Frame, operation: () => Promise<T>, kind: PendingTask["kind"] = "user", distinct = false): Promise<T> {
   const parent = currentTasks.getStore();
   if (!distinct && parent?.frame === frame && frame.pending.has(parent)) {
-    const promise = Promise.resolve().then(() => { if (frame.state !== "active") throw new OrmTransactionScopeError(); return operation(); });
+    const promise = Promise.resolve().then(() => { if (frame.state !== "active") throw scopeClosed(); return operation(); });
     parent.attached.add(promise);
-    void promise.catch(() => { frame.rollbackOnly ??= new OrmTransactionScopeError(); });
+    void promise.catch((error) => { frame.rollbackOnly ??= operationFailed(error); });
     promise.finally(() => { parent.attached.delete(promise); releaseTask(parent); }).catch(() => {});
     return Promise.race([promise, frame.abortPromise]);
   }
@@ -134,12 +155,12 @@ function trackTask<T>(frame: Frame, operation: () => Promise<T>, kind: PendingTa
   const task: PendingTask = { frame, kind, dispatches: new Set(), attached: new Set(), promise: Promise.resolve(), underlying: Promise.resolve(), abort, settled: false };
   frame.pending.add(task);
   const underlying = Promise.resolve().then(() => {
-    if (frame.state !== "active") throw new OrmTransactionScopeError();
+    if (frame.state !== "active") throw scopeClosed();
     return currentTasks.run(task, operation);
   });
   task.promise = underlying;
   (task as { underlying: Promise<unknown> }).underlying = underlying;
-  void underlying.catch(() => { frame.rollbackOnly ??= new OrmTransactionScopeError(); });
+  void underlying.catch((error) => { frame.rollbackOnly ??= operationFailed(error); });
   underlying.finally(() => { task.settled = true; releaseTask(task); }).catch(() => {});
   // Permanent rejection sink makes detached hostile user tails safe.
   void abortProjection.catch(() => {});
@@ -154,14 +175,17 @@ export async function transactionScope<TResult>(context: DbContext, provider: Da
   let signal = options?.signal;
   if (options?.timeoutMs !== undefined) positiveTimeout(options.timeoutMs, 30_000, "timeoutMs");
   if (signal !== undefined && !(signal instanceof AbortSignal)) throw new TypeError("ORM transaction signal must be an AbortSignal.");
-  const assertNotAborted = () => { if (signal?.aborted) throw new OrmTransactionScopeError("ORM transaction scope was aborted."); };
+  const abortReason = () => signal?.reason instanceof OrmTransactionScopeError ? signal.reason : new OrmTransactionScopeError("ORM transaction scope was aborted.");
+  const assertNotAborted = () => { if (signal?.aborted) throw abortReason(); };
   assertNotAborted();
   const token = contextToken(context);
   if (uncertainContexts.has(token)) throw new TransactionOutcomeUnknownError();
   const authority = rootAuthority(provider);
   const current = views.getStore();
   if (current) {
-    if (current.frame.authority !== authority || !current.enrolled.has(token) || current.frame.state !== "active") throw new OrmProviderIdentityMismatchError();
+    if (current.frame.authority !== authority) throw new OrmProviderIdentityMismatchError(contextName(context));
+    if (!current.enrolled.has(token)) throw notEnrolled(context);
+    if (current.frame.state !== "active") throw scopeClosed();
     if (current.frame.activeChild !== undefined) throw new ConcurrentTransactionScopeError();
   }
   const base = baseProvider(provider);
@@ -171,7 +195,7 @@ export async function transactionScope<TResult>(context: DbContext, provider: Da
   const uncertain = (error: unknown) => postgres.isOutcomeUncertain ? postgres.isOutcomeUncertain(error) : isUnknownTransactionOutcome(error);
   const inheritedSignal = postgres.operationSignal?.();
   const timeoutMs = positiveTimeout(options?.timeoutMs, postgres.operationTimeoutMs ?? 30_000, "timeoutMs");
-  const deadline = new OperationDeadline(timeoutMs, signal && inheritedSignal ? AbortSignal.any([signal, inheritedSignal]) : signal ?? inheritedSignal);
+  const deadline = new OperationDeadline(timeoutMs, signal && inheritedSignal ? AbortSignal.any([signal, inheritedSignal]) : signal ?? inheritedSignal, "ORM transaction scope");
   signal = deadline.signal;
   const parent = current?.frame;
   const ownership = Symbol("orm transaction child");
@@ -210,7 +234,7 @@ export async function transactionScope<TResult>(context: DbContext, provider: Da
       return withProviderDispatchObserver((dispatch) => registerDispatch(frame, dispatch), () => views.run(view, async () => {
         const transaction = new ScopedOrmTransaction(frame);
         const onAbort = () => {
-          const error = new OrmTransactionScopeError("ORM transaction scope was aborted.");
+          const error = abortReason();
           // Fence synchronously: a callback catching its aborted operation
           // cannot enqueue another query before asynchronous close starts.
           for (let target: Frame | undefined = frame; target; target = target.activeChildFrame) {
@@ -286,13 +310,13 @@ function registerDispatch(frame: Frame, dispatch: CancellableProviderDispatch):
   const settled = Promise.resolve(dispatch.settled);
   // Keep a rejection sink for detached driver promises while preserving the
   // original caller-facing rejection returned by query/execute.
-  void settled.catch(() => { frame.rollbackOnly ??= new OrmTransactionScopeError(); });
+  void settled.catch((error) => { frame.rollbackOnly ??= operationFailed(error); });
   settled.finally(() => { task.dispatches.delete(dispatch); releaseTask(task); }).catch(() => {});
 }
 
 async function settleFrame(frame: Frame): Promise<void> {
   if (frame.pending.size === 0) return;
-  frame.rollbackOnly ??= new OrmTransactionScopeError("ORM transaction scope has unresolved operations.");
+  frame.rollbackOnly ??= new OrmTransactionScopeError("ORM transaction scope callback returned while ORM operations were still running, so the scope was rolled back; await every ORM call inside the scope callback.");
   const capability = postgresTransactionCapability(frame.provider);
   const hasDispatch = [...frame.pending].some((task) => task.dispatches.size > 0);
   let quarantine = frame.cancellationRequested || (capability?.quarantineOnPendingDispatch && hasDispatch);
@@ -335,6 +359,7 @@ async function settleFrame(frame: Frame): Promise<void> {
   }
 }
 
+const foreignTransaction = () => new OrmTransactionScopeError("This transaction object belongs to another transaction scope; use the object passed to the innermost transactionScope() callback.");
 const transactionFrames = new WeakMap<ScopedOrmTransaction, Frame>();
 class ScopedOrmTransaction extends OrmTransaction {
   constructor(frame: Frame) { super(); transactionFrames.set(this, frame); }
@@ -343,9 +368,9 @@ class ScopedOrmTransaction extends OrmTransaction {
     const frame = this.#requireCurrentFrame();
     const token = contextToken(context);
     const provider = contextProviders.get(context);
-    if (!provider || rootAuthority(provider) !== frame.authority) throw new OrmProviderIdentityMismatchError();
+    if (!provider || rootAuthority(provider) !== frame.authority) throw new OrmProviderIdentityMismatchError(contextName(context));
     const parent = views.getStore();
-    if (!parent || parent.frame !== frame) throw new OrmTransactionScopeError();
+    if (!parent || parent.frame !== frame) throw foreignTransaction();
     if (uncertainContexts.has(token)) throw new TransactionOutcomeUnknownError();
     for (let target: Frame | undefined = frame; target; target = target.parent) target.allEnrolled.add(token);
     const enrolled = new Set(parent.enrolled); enrolled.add(token);
@@ -371,7 +396,9 @@ class ScopedOrmTransaction extends OrmTransaction {
   #requireCurrentFrame(): Frame {
     const frame = transactionFrames.get(this);
     const view = views.getStore();
-    if (!frame || frame.state !== "active" || frame.activeChild !== undefined || !view || view.frame !== frame) throw new OrmTransactionScopeError();
+    if (!frame || frame.state !== "active") throw new OrmTransactionScopeError("ORM transaction scope has already finished or is closing; use the transaction object only inside its transactionScope() callback.");
+    if (frame.activeChild !== undefined) throw nestedScopeRunning();
+    if (!view || view.frame !== frame) throw foreignTransaction();
     return frame;
   }
 }

package/library/orm/errors.ts

@@ -119,12 +119,16 @@ export class ConcurrentTransactionScopeError extends OrmError {
 
 /** Safe failure for a stale, closing, or unenrolled ORM transaction capability. */
 export class OrmTransactionScopeError extends OrmError {
-  constructor(message = "ORM transaction scope is not active for this operation.") { super(message); }
+  constructor(message = "ORM transaction scope is not active for this operation.", options?: ErrorOptions) { super(message, options); }
 }
 
 /** Contexts may share transaction work only when their configured provider is the same object. */
 export class OrmProviderIdentityMismatchError extends OrmError {
-  constructor() { super("ORM transaction context belongs to a different provider identity."); }
+  constructor(contextName = "This DbContext") { super(differentProviderMessage(contextName)); }
+}
+
+export function differentProviderMessage(contextName: string): string {
+  return `${contextName} uses a different database provider than the surrounding transaction scope. Contexts share one transaction only when they are created with the same provider object.`;
 }
 
 /** The provider did not return an exact safe millisecond database timestamp. */
@@ -134,15 +138,19 @@ export class OrmDatabaseTimeError extends OrmError {
 
 /** Immediate DML is deliberately isolated from tracked state. */
 export class OrmTrackedMutationConflictError extends OrmError {
-  constructor() { super("Immediate ORM mutation conflicts with tracked entities."); }
+  constructor(entityName?: string) {
+    super(entityName === undefined
+      ? "Immediate ORM mutation conflicts with tracked entities."
+      : `Immediate ORM mutation conflicts with tracked entities: this context tracks "${entityName}" entities (loaded with tracking or saved through saveChanges()), which the mutation would make stale. Load them with .asNoTracking(), or run the mutation in a separate DbContext.`);
+  }
 }
 /** Immediate DML accepts only the small, closed descriptor-safe input domain. */
 export class OrmUnsafeImmediateMutationError extends OrmError {
-  constructor() { super("Immediate ORM mutation input is unsafe or unsupported."); }
+  constructor(reason?: string) { super(reason === undefined ? "Immediate ORM mutation input is unsafe or unsupported." : `Immediate ORM mutation input is unsafe or unsupported: ${reason}.`); }
 }
 /** INSERT ON CONFLICT may name only an exactly declared unique target. */
 export class OrmUndeclaredConflictTargetError extends OrmError {
-  constructor() { super("Immediate ORM mutation conflict target is not a declared unique key."); }
+  constructor(detail?: string) { super(detail === undefined ? "Immediate ORM mutation conflict target is not a declared unique key." : `Immediate ORM mutation conflict target is not a declared unique key: ${detail}.`); }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bazis",
-  "version": "0.98.17",
+  "version": "0.98.19",
   "description": "Modular backend framework for Bun in TypeScript: DI wired by codegen, HTTP, a PostgreSQL ORM, JWT, WebSocket, agents and a CLI.",
   "license": "MIT",
   "author": "Alexander Alenin",