bazis 0.100.0 → 0.100.2

package/cli/codegen.ts

@@ -86,13 +86,12 @@ export function renderCodegen(ui: CliOutput, report: CodegenReport, cwd: string,
     commandFailed(ui.err, t.failure.codegen(report.errors.length), report.errors.map((error) => codegenProblem(error, cwd, ui.err)), 1, footer);
     return;
   }
+  // Files always; the rest only when the project has them.
   const counts = target === undefined ? [] : [
     s.num(target.sources, t.noun("file", target.sources)),
-    s.num(target.deps, t.noun("dep", target.deps)),
-    s.num(target.controllers, t.noun("controller", target.controllers)),
-    s.num(target.requestModels, t.noun("requestModel", target.requestModels)),
-    s.num(target.listModels, t.noun("list", target.listModels)),
-    s.num(target.tools, t.noun("tool", target.tools)),
+    ...([[target.deps, "dep"], [target.controllers, "controller"], [target.requestModels, "requestModel"], [target.listModels, "list"], [target.tools, "tool"]] as const)
+      .filter(([value]) => value > 0)
+      .map(([value, noun]) => s.num(value, t.noun(noun, value))),
   ];
   s.step("ok", t.step.codegen, counts.join(s.dot), time);
   const directories = new Map<string, string[]>();

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.100.0" }, capabilities: { experimentalApi: true },
+        clientInfo: { name: "bazis", title: "Bazis", version: "0.100.2" }, capabilities: { experimentalApi: true },
       }, 15_000, signal);
       if (resolve(text(initialized.codexHome, 4096)) !== this.paths.home) throw new CodexError("PROTOCOL_ERROR");
       client.notify("initialized");

package/core/infra/connectors/opensearch.ts

@@ -3,6 +3,7 @@ import type { AppConfig, ConfigRegistry, Secret } from "../../kernel";
 import { reader, requireValue, settingNames } from "../connectorConfig";
 import { errorMessage, InfraError, type InfraConnector } from "../InfraConnector";
 import { redactSensitive, redactSensitiveText } from "../../../library/redaction";
+import { identifyConnector } from "../connectorIdentity";
 
 /** Default cluster request timeout (ms): fail fast instead of hanging. */
 const DEFAULT_OPENSEARCH_TIMEOUT_MS = 5000;
@@ -295,7 +296,7 @@ export function openSearchConnect<T extends OpenSearchConfigShape>(
   options: OpenSearchConnectorOptions = {},
 ): InfraConnector<OpenSearchClient> {
   const settings = new WeakMap<OpenSearchClient, string[]>();
-  return {
+  return identifyConnector({
     token: options.token ?? IOpenSearch,
     config,
     create(configs) {
@@ -334,5 +335,5 @@ export function openSearchConnect<T extends OpenSearchConfigShape>(
     healthCheck(client, signal) {
       return client.ping(signal);
     },
-  };
+  }, "opensearch");
 }

package/core/infra/connectors/postgres.ts

@@ -3,6 +3,7 @@ import { createToken, type InjectionToken } from "../../di";
 import type { AppConfig, ConfigRegistry, Secret } from "../../kernel";
 import { reader, requireValue, settingNames } from "../connectorConfig";
 import { errorMessage, InfraError, type InfraConnector } from "../InfraConnector";
+import { identifyConnector } from "../connectorIdentity";
 
 /**
  * PostgreSQL client (native Bun `SQL`, no external dependencies) of the
@@ -83,7 +84,7 @@ export function postgres<T extends PostgresConfigShape>(config: AppConfig<T>, op
     throw new InfraError("postgres shutdownTimeoutMs must be an integer 0..2147483647");
   }
   const described = new WeakMap<SQL, { options: { hostname?: string; port?: number; database?: string; username?: string; max?: number }; settings: string[] }>();
-  return {
+  return identifyConnector({
     token: options.token ?? IPostgres,
     config,
     create(configs) {
@@ -118,7 +119,7 @@ export function postgres<T extends PostgresConfigShape>(config: AppConfig<T>, op
         return false;
       }
     },
-  };
+  }, "postgres");
 }
 
 /** `postgres@127.0.0.1:5432/app`: user, host, port and database, never the password. */

package/core/infra/connectors/redis.ts

@@ -12,6 +12,7 @@ import { RedisDistributedCacheBackend, type RedisDistributedCacheTuning } from "
 import { reader, requireValue, settingNames } from "../connectorConfig";
 import { errorMessage, InfraError, type InfraConnector } from "../InfraConnector";
 import { redactSensitiveText } from "../../../library/redaction";
+import { identifyConnector } from "../connectorIdentity";
 
 const DEFAULT_REDIS_CONNECT_TIMEOUT_MS = 5_000;
 
@@ -115,7 +116,7 @@ export function redisConnect<T extends RedisConfigShape>(
       ? undefined
       : distributedCacheProviders(cache === "distributed" ? {} : withoutMode(cache), token);
 
-  return {
+  return identifyConnector({
     token,
     config,
     providers: cacheProviders,
@@ -166,7 +167,7 @@ export function redisConnect<T extends RedisConfigShape>(
         return false;
       }
     },
-  };
+  }, "redis");
 }
 
 function redisUrl(value: unknown): string {

package/core/kernel/report/StartupScreen.ts

@@ -113,7 +113,7 @@ export class StartupScreen {
     if (schemas.length > 0) {
       const operations = schemas.flatMap((schema) => [...schema.migrated.map((name) => `migration ${name}`), ...schema.applied]);
       s.section(t.section.schema, s.muted([...new Set(schemas.map((schema) => schema.mode))].join(", ")));
-      s.step("ok", t.step.schema, operations.length === 0 ? s.muted(t.schema.none) : [s.num(operations.length, t.noun("operation", operations.length)), s.num(schemas.length, t.noun("schema", schemas.length))].join(s.dot), formatDuration(stageMs(kernel, "schema")));
+      s.step("ok", t.step.schema, operations.length === 0 ? s.muted(t.schema.none) : [s.num(operations.length, t.noun("operation", operations.length)), s.num(schemas.length, t.noun("context", schemas.length))].join(s.dot), formatDuration(stageMs(kernel, "schema")));
       const shown = operations.slice(0, 12).map((operation) => ({ text: `${s.strong("+", PALETTE.lime)} ${s.text(operation)}` }));
       if (operations.length > 12) shown.push({ text: s.muted(`… ${t.common.plus} ${operations.length - 12}`) });
       s.tree(shown, this.indent);

package/core/kernel/startupFailure.ts

@@ -1,9 +1,10 @@
 import { inspect } from "node:util";
 import { redactSensitive, redactSensitiveText } from "../../library/redaction";
+import { StartupFailuresError } from "./errors";
 
 const MAX_CAUSES = 5;
 /** Properties already printed in the header, the frames or the cause chain. */
-const SHOWN = new Set(["name", "message", "stack", "cause", "code", "errno", "errors"]);
+const SHOWN = new Set(["name", "message", "stack", "cause", "code", "errno", "errors", "failures"]);
 const INSPECT = { depth: null, colors: false, customInspect: false, getters: false, maxArrayLength: null, maxStringLength: null } as const;
 
 /**
@@ -28,7 +29,9 @@ export function formatStartupFailure(error: unknown): string {
     if (current instanceof AggregateError) {
       for (const inner of current.errors) lines.push(`  - ${inner instanceof Error ? `${inner.name}: ${inner.message}` : String(inner)}`);
     }
-    lines.push(...(current.stack ?? "").split("\n").filter((line) => /^\s+at /.test(line)));
+    // Services that failed together: the list above is the report; the
+    // aggregate's own frames are the kernel's, not the application's.
+    if (!(current instanceof StartupFailuresError)) lines.push(...(current.stack ?? "").split("\n").filter((line) => /^\s+at /.test(line)));
     const details = Object.fromEntries(Object.entries(current).filter(([name]) => !SHOWN.has(name)));
     if (Object.keys(details).length > 0) lines.push(inspect(redactSensitive(details), INSPECT));
     current = current.cause;

package/core/orm/OrmHostedPlan.validator.ts

@@ -1,6 +1,6 @@
 import type { HostedService, HostedServicePlanValidator } from "../di";
 import { SchemaAdmissionError } from "../../library/orm";
-import { isOrmProviderLifecycle, isStrictSchemaPrerequisiteLifecycle } from "./strictSchemaHostedIdentity";
+import { describePhaseConflict, isOrmProviderLifecycle, isStrictSchemaPrerequisiteLifecycle } from "./strictSchemaHostedIdentity";
 
 /** Stateless strategy shared by ORM lifecycles; it owns no connection or application state. */
 export const ormHostedPlanValidator: HostedServicePlanValidator = Object.freeze({ validate: validateOrmHostedPlan });
@@ -18,7 +18,7 @@ function validateOrmHostedPlan(services: readonly HostedService[]): void {
         || (service as { __bazisOrmOwnedStoreAdmission?: unknown }).__bazisOrmOwnedStoreAdmission === true
         || (service as { __bazisOrmLegacyLifecycle?: unknown }).__bazisOrmLegacyLifecycle === true
         || isStrictSchemaPrerequisiteLifecycle(service);
-      if (!framework && (service.phase ?? 0) < 0) throw new SchemaAdmissionError("ORM_SCHEMA_HOSTED_PHASE_CONFLICT", "Application hosted services must use phase 0 or later with ORM owned-store admission.");
+      if (!framework && (service.phase ?? 0) < 0) throw new SchemaAdmissionError("ORM_SCHEMA_HOSTED_PHASE_CONFLICT", `Application hosted services must use phase 0 or later with ORM owned-store admission: ${describePhaseConflict(service)}`);
     }
   }
   const strict = services.filter((service): service is HostedService & { readonly __bazisSchemaAdmission: { readonly owner?: string; readonly unit: readonly string[]; readonly tables: readonly string[]; readonly foreignKeys: readonly { readonly source: string; readonly target: string }[] } } =>
@@ -59,7 +59,7 @@ function validateOrmHostedPlan(services: readonly HostedService[]): void {
       || (service as { __bazisSchemaAdmission?: unknown }).__bazisSchemaAdmission !== undefined
       || (service as { __bazisOrmOwnedStoreAdmission?: unknown }).__bazisOrmOwnedStoreAdmission === true;
     if (!framework && (service.phase ?? 0) < 0) {
-      throw new SchemaAdmissionError("ORM_SCHEMA_HOSTED_PHASE_CONFLICT", "Application hosted services must use phase 0 or later with schema admission.");
+      throw new SchemaAdmissionError("ORM_SCHEMA_HOSTED_PHASE_CONFLICT", `Application hosted services must use phase 0 or later with schema admission: ${describePhaseConflict(service)}`);
     }
   }
 }

package/core/orm/strictSchemaHostedIdentity.ts

@@ -9,9 +9,24 @@ export function isOrmProviderLifecycle(lifecycle: HostedService): boolean {
   return connector?.token === DATABASE_PROVIDER && lifecycle.phase === -110;
 }
 
+/**
+ * Unchanged framework connectors that never touch the schema: they may start
+ * at phase -100, after schema admission and before application services.
+ */
+const PREREQUISITE_ROLES = new Set(["llm", "agent-session-checkpoint-protection", "postgres", "redis", "opensearch"]);
+
 /** Only these unchanged factory-owned resources may precede application services. */
 export function isStrictSchemaPrerequisiteLifecycle(lifecycle: HostedService): boolean {
   if ((lifecycle.phase ?? 0) !== -100) return false;
   const role = getLifecycleConnectorRole(lifecycle);
-  return role === "llm" || role === "agent-session-checkpoint-protection";
+  return role !== undefined && PREREQUISITE_ROLES.has(role);
+}
+
+/** The service a phase conflict is about and what to do with it. */
+export function describePhaseConflict(service: HostedService): string {
+  const name = service.diagnosticName ?? service.constructor?.name ?? "a hosted service";
+  const connector = getLifecycleConnector(service) !== undefined;
+  return connector
+    ? `${name} (phase ${service.phase ?? 0}) is not a framework connector; a custom or changed connector starts at phase 0 or later: set phase: 0 on it.`
+    : `${name} has phase ${service.phase ?? 0}; use phase 0 or later.`;
 }

package/library/terminal/messages.ts

@@ -31,6 +31,7 @@ const NOUNS_EN = {
   test: ["test", "tests", "tests"],
   change: ["change", "changes", "changes"],
   part: ["part", "parts", "parts"],
+  context: ["database context", "database contexts", "database contexts"],
 } as const satisfies Record<string, Forms>;
 
 export type Noun = keyof typeof NOUNS_EN;
@@ -58,8 +59,19 @@ const NOUNS_RU: Record<Noun, Forms> = {
   test: ["тест", "теста", "тестов"],
   change: ["изменение", "изменения", "изменений"],
   part: ["часть", "части", "частей"],
+  context: ["контекст базы данных", "контекста базы данных", "контекстов базы данных"],
 };
 
+/** Genitive after «из N»: «из 1 подключения», «из 3 подключений», «из 21 подключения». */
+const GENITIVE_RU: Partial<Record<Noun, readonly [one: string, many: string]>> = {
+  connection: ["подключения", "подключений"],
+};
+
+function genitiveRu(count: number, noun: Noun): string {
+  const forms = GENITIVE_RU[noun] ?? [NOUNS_RU[noun][1], NOUNS_RU[noun][2]];
+  return count % 10 === 1 && count % 100 !== 11 ? forms[0] : forms[1];
+}
+
 function formEn(count: number, forms: Forms): string {
   return count === 1 ? forms[0] : forms[1];
 }
@@ -316,7 +328,7 @@ const ru: Messages = {
   },
   failure: {
     config: (count) => `конфигурация с ошибками · ${count} ${formRu(count, NOUNS_RU.problem)}`,
-    infra: (down, total) => `инфраструктура недоступна · ${down} из ${total} ${formRu(total, NOUNS_RU.connection)}`,
+    infra: (down, total) => `инфраструктура недоступна · ${down} из ${total} ${genitiveRu(total, "connection")}`,
     timeout: (seconds) => `запуск не уложился в ${seconds}`,
     di: "внедрение зависимостей не собрано",
     codegen: (count) => `кодогенерация не удалась · ${count} ${formRu(count, NOUNS_RU.error)}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bazis",
-  "version": "0.100.0",
+  "version": "0.100.2",
   "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",